| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://framagit.org/hubzilla/core | Mario Vavti | 2018-11-19 | 1 | -2/+0 |
| |\ | |||||
| | * | Merge branch 'patch-20181118a' into 'dev' | Mario | 2018-11-19 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | Patch 20181118a - fix delayed publication of posts See merge request hubzilla/core!1398 (cherry picked from commit f34af496ec82555a0e070e91260dc6edb17f2d5a) 3787c490 Fix: delayed items propagate before publication on cloned channels | ||||
| * | | changelog | Mario Vavti | 2018-11-19 | 1 | -0/+9 |
| |/ | |||||
| * | update sql schemas to include update column in pconfig table | Mario Vavti | 2018-11-19 | 2 | -5/+5 |
| | | |||||
| * | recalculate photo filesize when rotating an image | Mario Vavti | 2018-11-17 | 1 | -10/+19 |
| | | |||||
| * | strlen($this->imageString()) does not return the correct size when dealing ↵ | Mario Vavti | 2018-11-16 | 1 | -2/+2 |
| | | | | | with os_storage images. use filesize() instead. | ||||
| * | Merge branch 'master' into 'master' | Mario | 2018-11-16 | 1 | -3/+3 |
| |\ | | | | | | | | | delivery issue See merge request hubzilla/core!1397 | ||||
| | * | delivery issue | zotlabs | 2018-11-15 | 1 | -3/+3 |
| |/ | |||||
| * | more changelog3.8.4 | Mario Vavti | 2018-11-14 | 1 | -0/+2 |
| | | |||||
| * | Merge branch 'dev' | Mario Vavti | 2018-11-14 | 33 | -424/+844 |
| |\ | |||||
| | * | changelog and version | Mario Vavti | 2018-11-14 | 2 | -1/+19 |
| | | | |||||
| | * | Merge branch 'patch-20181113b' into 'dev' | Mario | 2018-11-14 | 2 | -3/+3 |
| | |\ | | | | | | | | | | | | | Patch 20181113b See merge request hubzilla/core!1395 | ||||
| | | * | Fix double escaping after xss fix | DM42.Net (Matt Dent) | 2018-11-13 | 1 | -2/+2 |
| | | | | |||||
| | | * | Revert "Filter search box before display" | DM42.Net (Matt Dent) | 2018-11-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | This reverts commit 35e66770be6ca93c9090cdab221e6c33a410a569. | ||||
| | * | | Merge branch 'dev' into 'dev' | Mario | 2018-11-14 | 2 | -28/+9 |
| | |\ \ | | |/ | |/| | | | | | | | Remove unneccessary fetch_image_from_url() function See merge request hubzilla/core!1393 | ||||
| | | * | Update Photo.php | Max Kostikov | 2018-11-13 | 1 | -4/+4 |
| | | | | |||||
| | | * | Remove uneccessary include/photos.php | Max Kostikov | 2018-11-13 | 1 | -1/+0 |
| | | | | |||||
| | | * | Text formatting in Photo.php | Max Kostikov | 2018-11-13 | 1 | -2/+2 |
| | | | | |||||
| | | * | Replace fetch_image_from_url() with z_fetch_url() | Max Kostikov | 2018-11-13 | 1 | -6/+8 |
| | | | | |||||
| | | * | Remove fetch_image_from_url() because of functions duplicate | Max Kostikov | 2018-11-13 | 1 | -20/+0 |
| | | | | |||||
| | * | | Merge branch 'patch-20181113a' into 'dev' | M. Dent | 2018-11-14 | 3 | -6/+16 |
| | |\ \ | | | | | | | | | | | | | | | | | Patch 20181113a See merge request hubzilla/core!1394 | ||||
| | | * \ | Merge remote-tracking branch red/master into patch-20181113a. Add Mike's fix ↵ | DM42.Net (Matt Dent) | 2018-11-13 | 2 | -5/+15 |
| | | |\ \ | | | | | | | | | | | | | | | | to search xss and Superblock fix. | ||||
| | | | * | | xss in search | zotlabs | 2018-11-13 | 1 | -3/+3 |
| | | | | | | |||||
| | | | * | | enotify::format hook for superblock | zotlabs | 2018-11-12 | 1 | -2/+12 |
| | | | | | | |||||
| | | | * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-11-07 | 19 | -47/+208 |
| | | | |\ \ | |||||
| | | * | | | | Filter search box before display | DM42.Net (Matt Dent) | 2018-11-13 | 1 | -1/+1 |
| | |/ / / / | |||||
| | * | | | | Merge branch 'revert-6375f2d7' into 'dev' | Max Kostikov | 2018-11-13 | 1 | -9/+6 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Replace fetch_image_from_url() with z_fetch_url()" See merge request hubzilla/core!1392 | ||||
| | | * | | | | Revert "Replace fetch_image_from_url() with z_fetch_url()" | Max Kostikov | 2018-11-13 | 1 | -9/+6 |
| | |/ / / / | | | | | | | | | | | This reverts commit 6375f2d73a0c314e8de12071f1e604e59d8c76de | ||||
| | * | | | | Replace fetch_image_from_url() with z_fetch_url() | Max Kostikov | 2018-11-13 | 1 | -6/+9 |
| | | | | | | |||||
| | * | | | | Merge branch 'fix-activity-filter-widget' into 'dev' | M. Dent | 2018-11-12 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | use the correct javascript function for this case See merge request hubzilla/core!1390 | ||||
| | | * | | | | use the correct javascript function for this case | Mario Vavti | 2018-11-11 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'css-fixes' into 'dev' | M. Dent | 2018-11-12 | 3 | -12/+8 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | css fixes See merge request hubzilla/core!1391 | ||||
| | | * | | | | fix css issues in bbcode conversion and focus-light schema | Mario Vavti | 2018-11-12 | 3 | -12/+8 |
| | |/ / / / | |||||
| | * | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-11-11 | 3 | -14/+18 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch 'dev' into 'dev' | Mario | 2018-11-11 | 2 | -5/+9 |
| | | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | Preserve photo modification date on edit See merge request hubzilla/core!1389 | ||||
| | | | * | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2018-11-10 | 1 | -9/+9 |
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # include/photo/photo_driver.php | ||||
| | | | * | | | | Update photo_driver.php | Max Kostikov | 2018-11-10 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | | * | | | | Preserve photo modification date | Max Kostikov | 2018-11-10 | 1 | -4/+8 |
| | | | | | | | | |||||
| | | | * | | | | Fixed wrong value assign on compare with 0 | Max Kostikov | 2018-11-10 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Merge branch 'dev' into 'dev' | Mario | 2018-11-11 | 1 | -5/+2 |
| | | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | fix shared_header img expanding to 100% width when sharing a share See merge request hubzilla/core!1387 | ||||
| | | * | | | | | Merge branch 'dev' into 'dev' | Mario | 2018-11-10 | 1 | -9/+9 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove DNS check for database connection during installation... See merge request hubzilla/core!1384 | ||||
| | | | * | | | | | Remove DNS check for database connection during installation. Causes ↵ | Andrew Manning | 2018-11-09 | 1 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | friction with Docker deployment. | ||||
| | * | | | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-11-10 | 3 | -16/+20 |
| | |\| | | | | | | | |_|/ / / / | |/| | | | | | |||||
| | | * | | | | | Fixed wrong value assign on compare with 0 | Max Kostikov | 2018-11-10 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Merge branch 'dev' into 'dev' | Mario | 2018-11-10 | 3 | -15/+19 |
| | | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | Preserve received image modification date on caching See merge request hubzilla/core!1386 | ||||
| | | | * | | | | Do not return default images from vCard | Max Kostikov | 2018-11-10 | 1 | -1/+0 |
| | | | | | | | | |||||
| | | | * | | | | Remove unnecessary Zulu timezone mention | Max Kostikov | 2018-11-10 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | | * | | | | Preserve received image modification date on caching | Max Kostikov | 2018-11-09 | 1 | -11/+16 |
| | | | | | | | | |||||
| | | | * | | | | Fixed timezone conversion | Max Kostikov | 2018-11-09 | 1 | -4/+4 |
| | | |/ / / / | |||||
| | * / / / / | fix shared_header img expanding to 100% width when sharing a share | Mario Vavti | 2018-11-10 | 1 | -5/+2 |
| | |/ / / / | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |