aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* strlen($this->imageString()) does not return the correct size when dealing wi...Mario Vavti2018-11-161-2/+2
* Merge branch 'dev_homeinstall_raspihub' into 'dev'Mario2018-11-163-18/+46
|\
| * Merge remote-tracking branch 'official/dev' into dev_homeinstall_raspihubOJ Random2018-11-141-1/+1
| |\
| * | localhost, URLs, version updatesOJ Random2018-11-143-18/+46
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-11-1618-121/+75
|\ \ \
| * | | datetime_convert wrong argszotlabs2018-11-152-2/+2
| * | | more work on the mid/uuid conversionzotlabs2018-11-151-17/+19
| * | | delivery report issuezotlabs2018-11-151-2/+3
| * | | add item.uuid to relevant placeszotlabs2018-11-1511-32/+44
| * | | mid -> uuid conversions for basic reactionszotlabs2018-11-152-3/+7
| * | | remove checkjs and nojszotlabs2018-11-152-65/+0
* | | | fix update 1228Mario Vavti2018-11-151-1/+0
|/ / /
* | | separate by networkzotlabs2018-11-141-0/+1
* | | update httpsig unit test which is failingzotlabs2018-11-141-0/+2
* | | fixes to old z6 deliveryzotlabs2018-11-141-4/+3
* | | more loggingzotlabs2018-11-141-0/+2
* | | more loggingzotlabs2018-11-141-0/+1
* | | check keyidzotlabs2018-11-141-1/+1
* | | filter by networkzotlabs2018-11-141-2/+2
* | | crypto fixzotlabs2018-11-141-1/+1
* | | encrypted header issuezotlabs2018-11-141-1/+1
* | | extra loggingzotlabs2018-11-141-0/+4
* | | fix dreport linkzotlabs2018-11-142-3/+6
* | | change db update counterzotlabs2018-11-141-1/+1
* | | Merge branch 'master' into zvizotlabs2018-11-146-33/+33
|\ \ \ | | |/ | |/|
| * | version 3.9.5Mario Vavti2018-11-141-1/+1
| |/
| * 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
| * | | version 3.8.33.8.3Mario Vavti2018-11-051-1/+1
| * | | update changelogMario Vavti2018-11-051-0/+14
| * | | update linkinfo from devMario Vavti2018-11-051-7/+30
| * | | Merge branch 'dev'Mario Vavti2018-11-05316-5295/+6481
| |\ \ \
| * \ \ \ Merge branch 'dev'3.8.2Mario Vavti2018-10-291-0/+22
| |\ \ \ \
| * | | | | merge Zotlabs/Access/PermissionLimits.php from devMario Vavti2018-10-291-1/+1
| * | | | | merge view/fr/hmessages.po from devMario Vavti2018-10-291-50/+2
| * | | | | merge view/ru/hstrings.php from devMario Vavti2018-10-291-5/+1
| * | | | | merge view/ru/hmessages.po from devMario Vavti2018-10-291-19/+19
| * | | | | merge view/it/hstrings.php from devMario Vavti2018-10-291-1/+1
| * | | | | merge view/it/hmessages.po from devMario Vavti2018-10-291-41/+39
| * | | | | merge view/es-es/hstrings.php from devMario Vavti2018-10-291-2/+0