aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-photo' into 'dev'M. Dent2018-11-081-1/+1
|\ | | | | | | | | Fix photo See merge request hubzilla/core!1382
| * Merge branch 'patch-1' into 'fix-photo'Mario2018-11-081-1/+1
| |\ | | | | | | | | | | | | Correct "Content-Length:" calculation added See merge request mario/core!1
| | * Correct "Content-Length:" calculation addedMax Kostikov2018-11-081-1/+1
| |/
* | Merge branch 'fix-photo' into 'dev'M. Dent2018-11-081-1/+2
|\| | | | | | | | | $data only contains the link to the image if the image is in os storage. The… See merge request hubzilla/core!1379
| * $data only contains the link to the image if the image is in os storage. The ↵Mario Vavti2018-11-081-1/+2
|/ | | | size is calculatet wrong in this case and the download fails. rely on filesize from the db for content-length
* Merge branch 'patch-1' into 'dev'Mario2018-11-081-6/+6
|\ | | | | | | | | Disable image caching if personal or group permissions enabled See merge request hubzilla/core!1377
| * Disable image caching if personal or group permissions enabledMax Kostikov2018-11-071-6/+6
| |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-11-081-6/+14
|\|
| * Merge branch 'patch-1' into 'dev'M. Dent2018-11-071-6/+14
| |\ | | | | | | | | | | | | Added `If-Modified-Since` header support for better image caching and fixed absent 404 for photos See merge request hubzilla/core!1375
| | * Added `If-Modified-Since` header support for better image caching and fixed ↵Max Kostikov2018-11-071-6/+14
| |/ | | | | | | absent 404 for photos
* | provide a function to log to syslogMario Vavti2018-11-081-0/+13
| |
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-11-073-45/+95
|\ \
| * | signature issuezotlabs2018-11-061-1/+1
| | |
| * | these changes needed to ensure cloning/syncing works in the future to ↵zotlabs2018-11-052-44/+94
| | | | | | | | | | | | non-zot6 enabled servers after the (coming) zot6 schema updates. This should probably be on a fast track to master branch
* | | fix es-es hstrings.phpMario Vavti2018-11-071-2/+2
| |/ |/|
* | Merge branch 'revert-40d9277e' into 'dev'Mario2018-11-071-1/+2
|\ \ | | | | | | | | | | | | Revert "remove 'Expiries' HTTP header" See merge request hubzilla/core!1372
| * | Revert "remove 'Expiries' HTTP header"Max Kostikov2018-11-071-1/+2
|/ / | | | | This reverts commit 40d9277ef38ef1200db59cd2f8c6b9e2a80bc332
* | Merge branch 'patch-25' into 'dev'M. Dent2018-11-061-13/+20
|\ \ | | | | | | | | | | | | 'Last-Modified' and 'Content-Length' HTTP headers added for better image caching See merge request hubzilla/core!1369
| * | remove 'Expiries' HTTP header Max Kostikov2018-11-061-2/+1
| | |
| * | Update Photo.phpMax Kostikov2018-11-061-2/+2
| | |
| * | Update Photo.phpMax Kostikov2018-11-061-4/+2
| | |
| * | Update Photo.phpMax Kostikov2018-11-061-2/+3
| | |
| * | 'Last-Modified' and 'Content-Length' HTTP headers added for better image cachingMax Kostikov2018-11-061-9/+18
| | |
* | | Merge branch 'patch-26' into 'dev'M. Dent2018-11-069-9/+9
|\ \ \ | |/ / |/| | | | | | | | New plural functions for JavaScript compatibility See merge request hubzilla/core!1370
| * | Update hmessages.poMax Kostikov2018-11-061-1/+1
| | |
| * | Update hmessages.poMax Kostikov2018-11-061-1/+1
| | |
| * | New pt-br plural function for JavaScript compatibilityMax Kostikov2018-11-061-1/+1
| | |
| * | New nl plural function for JavaScript compatibilityMax Kostikov2018-11-061-1/+1
| | |
| * | New nb-no plural function for JavaScript compatibilityMax Kostikov2018-11-061-1/+1
| | |
| * | New it plural function for JavaScript compatibilityMax Kostikov2018-11-061-1/+1
| | |
| * | New he plural function for JavaScript compatibilityMax Kostikov2018-11-061-1/+1
| | |
| * | New fi plural function for JavaScript compatibilityMax Kostikov2018-11-061-1/+1
| | |
| * | New es plural function for JavaScript compatibilityMax Kostikov2018-11-061-1/+1
| | |
| * | New fr plural function for JavaScript compatibilityMax Kostikov2018-11-061-1/+1
| | |
| * | New plural function for JavaScript compatibilityMax Kostikov2018-11-061-1/+1
|/ /
* | Merge branch 'patch-23' into 'dev'M. Dent2018-11-061-4/+2
|\ \ | | | | | | | | | | | | Use modern get_config() syntax See merge request hubzilla/core!1368
| * | Update Photo.phpMax Kostikov2018-11-051-1/+1
| | |
| * | Use modern get_config() syntaxMax Kostikov2018-11-051-4/+2
|/ /
* | Merge branch 'patch-20181028a' into 'dev'Mario2018-11-056-20/+157
|\ \ | | | | | | | | | | | | Add timestamp to pconfig See merge request hubzilla/core!1355
| * | strpos needs to test with ===0 not ==0M.Dent2018-11-011-3/+3
| | |
| * | Add tracking of deleted pconfig variablesM.Dent2018-10-291-4/+40
| | |
| * | Fix to set update time in pconfig on updateM.Dent2018-10-281-3/+3
| | |
| * | Add timestamp and associated logic to pconfigM.Dent2018-10-283-16/+90
| | |
| * | DB Updates to prep for pconfig timestamps.M.Dent2018-10-283-1/+28
| | |
* | | update changelog and bump versionMario Vavti2018-11-052-1/+15
| | |
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-11-053-129/+319
|\ \ \ | | |/ | |/|
| * | debug zot6 discoveryzotlabs2018-11-041-118/+283
| | |
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-11-045-8/+13
| |\ \
| * | | z6 updates to owa, linkinfo improved image detectionzotlabs2018-11-042-11/+36
| | | |
* | | | Merge branch 'dev' into 'dev'Mario2018-11-052-2/+6
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | more fixes for forum notifications handling: do not count likes/dislikes if… See merge request hubzilla/core!1367