aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into zvizotlabs2018-11-0719-47/+208
|\
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-11-0719-47/+208
| |\
| | * Merge branch 'revert-40d9277e' into 'dev'Mario2018-11-071-1/+2
| | |\
| | | * Revert "remove 'Expiries' HTTP header"Max Kostikov2018-11-071-1/+2
| | |/
| | * Merge branch 'patch-25' into 'dev'M. Dent2018-11-061-13/+20
| | |\
| | | * 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
| | |\ \ | | | |/ | | |/|
| | | * 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
| | |\
| | | * 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
| | |\
| | | * 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
| | |\ \
| | * \ \ Merge branch 'dev' into 'dev'Mario2018-11-052-2/+6
| | |\ \ \
| | | * | | more fixes for forum notifications handling: do not count likes/dislikes if l...Mario Vavti2018-11-032-2/+6
| * | | | | signature issuezotlabs2018-11-061-1/+1
* | | | | | fix signatureszotlabs2018-11-062-2/+2
* | | | | | this is brutalzotlabs2018-11-0610-124/+397
* | | | | | more zot6 workzotlabs2018-11-052-18/+43
* | | | | | populate new fieldszotlabs2018-11-052-16/+47
* | | | | | z6 workzotlabs2018-11-054-5/+15
|/ / / / /
* | | / / these changes needed to ensure cloning/syncing works in the future to non-zot...zotlabs2018-11-052-44/+94
| |_|/ / |/| | |
* | | | debug zot6 discoveryzotlabs2018-11-041-118/+283
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-11-045-8/+13
|\| | |
| * | | Merge branch 'dev' into 'dev'Mario2018-11-031-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fixed typo at view/es-es/hstrings.phpManuel Jiménez Friaza2018-11-031-1/+1
| |/ /
| * | Merge branch 'patch-3' into 'dev'Mario2018-11-031-3/+3
| |\ \
| | * | Update hmessages.pogia vec2018-11-021-3/+3
| * | | Merge branch 'patch-2' into 'dev'Mario2018-11-031-1/+1
| |\ \ \
| | * | | Update hstrings.phpgia vec2018-11-021-1/+1
| | |/ /