aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* changelogMario Vavti2018-11-191-0/+9
| | | (cherry picked from commit 5cb4cdaa5e42f87e9d26501150d6d689b56a1cd2)
* update sql schemas to include update column in pconfig tableMario Vavti2018-11-192-5/+5
| | | (cherry picked from commit ae97649948b8af575441e5a1f5b69db9f627a0e2)
* Merge branch 'patch-20181118a' into 'dev'Mario2018-11-191-2/+0
|\ | | | | | | | | Patch 20181118a - fix delayed publication of posts See merge request hubzilla/core!1398
| * Fix: delayed items propagate before publication on cloned channelsDM42.Net (Matt Dent)2018-11-181-2/+0
| |
* | Merge branch 'mod-zot-fix' into 'dev'Max Kostikov2018-11-181-1/+1
|\ \ | |/ |/| | | | | fix typo which prevented propagation of comments See merge request hubzilla/core!1399
| * fix typo which prevented propagation of commentsMario Vavti2018-11-181-1/+1
|/
* recalculate photo filesize when rotating an imageMario Vavti2018-11-171-10/+19
| | | (cherry picked from commit f15e32d0637fdf84de7cab43b558ec8a383d3cf5)
* Add filesize for streaming contentMax Kostikov2018-11-161-0/+1
|
* Fix return on wrong sotred in Content-Length size for full size photosMax Kostikov2018-11-161-2/+4
|
* strlen($this->imageString()) does not return the correct size when dealing ↵Mario Vavti2018-11-161-2/+2
| | | | | with os_storage images. use filesize() instead. (cherry picked from commit afc75af62f759181bbe6a806b523c6ca52126f5f)
* Merge branch 'dev_homeinstall_raspihub' into 'dev'Mario2018-11-163-18/+46
|\ | | | | | | | | localhost, URLs, version updates See merge request hubzilla/core!1396
| * 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
| | |\ | | | | | | | | | | | | | | | | Patch 20181113b See merge request hubzilla/core!1395
| | | * 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
| | | | | | | | | | | | | | | | This reverts commit 35e66770be6ca93c9090cdab221e6c33a410a569.
| | * | Merge branch 'dev' into 'dev'Mario2018-11-142-28/+9
| | |\ \ | | | |/ | | |/| | | | | | | | | Remove unneccessary fetch_image_from_url() function See merge request hubzilla/core!1393
| | | * 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
| | | |