aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix call to undefined functionMario Vavti2018-11-211-1/+1
* fix typo which prevented propagation of commentsMario Vavti2018-11-201-1/+1
* version 3.8.53.8.5Mario Vavti2018-11-191-1/+1
* Merge branch 'master' of https://framagit.org/hubzilla/coreMario Vavti2018-11-191-2/+0
|\
| * Merge branch 'patch-20181118a' into 'dev'Mario2018-11-191-2/+0
* | changelogMario Vavti2018-11-191-0/+9
|/
* update sql schemas to include update column in pconfig tableMario Vavti2018-11-192-5/+5
* recalculate photo filesize when rotating an imageMario Vavti2018-11-171-10/+19
* strlen($this->imageString()) does not return the correct size when dealing wi...Mario Vavti2018-11-161-2/+2
* Merge branch 'master' into 'master'Mario2018-11-161-3/+3
|\
| * delivery issuezotlabs2018-11-151-3/+3
|/
* more changelog3.8.4Mario Vavti2018-11-141-0/+2
* Merge branch 'dev'Mario Vavti2018-11-1433-424/+844
|\
| * changelog and versionMario Vavti2018-11-142-1/+19
| * Merge branch 'patch-20181113b' into 'dev'Mario2018-11-142-3/+3
| |\
| | * Fix double escaping after xss fixDM42.Net (Matt Dent)2018-11-131-2/+2
| | * Revert "Filter search box before display"DM42.Net (Matt Dent)2018-11-131-1/+1
| * | Merge branch 'dev' into 'dev'Mario2018-11-142-28/+9
| |\ \ | | |/ | |/|
| | * Update Photo.phpMax Kostikov2018-11-131-4/+4
| | * Remove uneccessary include/photos.php Max Kostikov2018-11-131-1/+0
| | * Text formatting in Photo.phpMax Kostikov2018-11-131-2/+2
| | * Replace fetch_image_from_url() with z_fetch_url()Max Kostikov2018-11-131-6/+8
| | * Remove fetch_image_from_url() because of functions duplicateMax Kostikov2018-11-131-20/+0
| * | Merge branch 'patch-20181113a' into 'dev'M. Dent2018-11-143-6/+16
| |\ \
| | * \ Merge remote-tracking branch red/master into patch-20181113a. Add Mike's fix ...DM42.Net (Matt Dent)2018-11-132-5/+15
| | |\ \
| | | * | xss in searchzotlabs2018-11-131-3/+3
| | | * | enotify::format hook for superblockzotlabs2018-11-121-2/+12
| | | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-11-0719-47/+208
| | | |\ \
| | * | | | Filter search box before displayDM42.Net (Matt Dent)2018-11-131-1/+1
| |/ / / /
| * | | | Merge branch 'revert-6375f2d7' into 'dev'Max Kostikov2018-11-131-9/+6
| |\ \ \ \
| | * | | | Revert "Replace fetch_image_from_url() with z_fetch_url()"Max Kostikov2018-11-131-9/+6
| |/ / / /
| * | | | Replace fetch_image_from_url() with z_fetch_url()Max Kostikov2018-11-131-6/+9
| * | | | Merge branch 'fix-activity-filter-widget' into 'dev'M. Dent2018-11-121-1/+1
| |\ \ \ \
| | * | | | use the correct javascript function for this caseMario Vavti2018-11-111-1/+1
| * | | | | Merge branch 'css-fixes' into 'dev'M. Dent2018-11-123-12/+8
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | fix css issues in bbcode conversion and focus-light schemaMario Vavti2018-11-123-12/+8
| |/ / / /
| * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-11-113-14/+18
| |\ \ \ \
| | * \ \ \ Merge branch 'dev' into 'dev'Mario2018-11-112-5/+9
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge branch 'dev' into 'dev'Max Kostikov2018-11-101-9/+9
| | | |\ \ \
| | | * | | | Update photo_driver.phpMax Kostikov2018-11-101-1/+1
| | | * | | | Preserve photo modification dateMax Kostikov2018-11-101-4/+8
| | | * | | | Fixed wrong value assign on compare with 0Max Kostikov2018-11-101-1/+1
| | * | | | | Merge branch 'dev' into 'dev'Mario2018-11-111-5/+2
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge branch 'dev' into 'dev'Mario2018-11-101-9/+9
| | |\ \ \ \ \
| | | * | | | | Remove DNS check for database connection during installation. Causes friction...Andrew Manning2018-11-091-9/+9
| * | | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-11-103-16/+20
| |\| | | | | | | | |_|/ / / / | |/| | | | |
| | * | | | | Fixed wrong value assign on compare with 0Max Kostikov2018-11-101-1/+1
| | * | | | | Merge branch 'dev' into 'dev'Mario2018-11-103-15/+19
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Do not return default images from vCardMax Kostikov2018-11-101-1/+0
| | | * | | | Remove unnecessary Zulu timezone mentionMax Kostikov2018-11-101-1/+1