Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | didn't need xchan_portable_id | zotlabs | 2018-11-08 | 2 | -4/+0 |
| | |||||
* | item db updates | zotlabs | 2018-11-08 | 2 | -0/+6 |
| | |||||
* | Merge branch 'master' into zvi | zotlabs | 2018-11-07 | 19 | -47/+208 |
|\ | |||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-11-07 | 19 | -47/+208 |
| |\ | |||||
| | * | Merge branch 'revert-40d9277e' into 'dev' | Mario | 2018-11-07 | 1 | -1/+2 |
| | |\ | | | | | | | | | | | | | | | | | Revert "remove 'Expiries' HTTP header" See merge request hubzilla/core!1372 | ||||
| | | * | Revert "remove 'Expiries' HTTP header" | Max Kostikov | 2018-11-07 | 1 | -1/+2 |
| | |/ | | | | | | | This reverts commit 40d9277ef38ef1200db59cd2f8c6b9e2a80bc332 | ||||
| | * | Merge branch 'patch-25' into 'dev' | M. Dent | 2018-11-06 | 1 | -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 Kostikov | 2018-11-06 | 1 | -2/+1 |
| | | | | |||||
| | | * | Update Photo.php | Max Kostikov | 2018-11-06 | 1 | -2/+2 |
| | | | | |||||
| | | * | Update Photo.php | Max Kostikov | 2018-11-06 | 1 | -4/+2 |
| | | | | |||||
| | | * | Update Photo.php | Max Kostikov | 2018-11-06 | 1 | -2/+3 |
| | | | | |||||
| | | * | 'Last-Modified' and 'Content-Length' HTTP headers added for better image caching | Max Kostikov | 2018-11-06 | 1 | -9/+18 |
| | | | | |||||
| | * | | Merge branch 'patch-26' into 'dev' | M. Dent | 2018-11-06 | 9 | -9/+9 |
| | |\ \ | | | |/ | | |/| | | | | | | | | | New plural functions for JavaScript compatibility See merge request hubzilla/core!1370 | ||||
| | | * | Update hmessages.po | Max Kostikov | 2018-11-06 | 1 | -1/+1 |
| | | | | |||||
| | | * | Update hmessages.po | Max Kostikov | 2018-11-06 | 1 | -1/+1 |
| | | | | |||||
| | | * | New pt-br plural function for JavaScript compatibility | Max Kostikov | 2018-11-06 | 1 | -1/+1 |
| | | | | |||||
| | | * | New nl plural function for JavaScript compatibility | Max Kostikov | 2018-11-06 | 1 | -1/+1 |
| | | | | |||||
| | | * | New nb-no plural function for JavaScript compatibility | Max Kostikov | 2018-11-06 | 1 | -1/+1 |
| | | | | |||||
| | | * | New it plural function for JavaScript compatibility | Max Kostikov | 2018-11-06 | 1 | -1/+1 |
| | | | | |||||
| | | * | New he plural function for JavaScript compatibility | Max Kostikov | 2018-11-06 | 1 | -1/+1 |
| | | | | |||||
| | | * | New fi plural function for JavaScript compatibility | Max Kostikov | 2018-11-06 | 1 | -1/+1 |
| | | | | |||||
| | | * | New es plural function for JavaScript compatibility | Max Kostikov | 2018-11-06 | 1 | -1/+1 |
| | | | | |||||
| | | * | New fr plural function for JavaScript compatibility | Max Kostikov | 2018-11-06 | 1 | -1/+1 |
| | | | | |||||
| | | * | New plural function for JavaScript compatibility | Max Kostikov | 2018-11-06 | 1 | -1/+1 |
| | |/ | |||||
| | * | Merge branch 'patch-23' into 'dev' | M. Dent | 2018-11-06 | 1 | -4/+2 |
| | |\ | | | | | | | | | | | | | | | | | Use modern get_config() syntax See merge request hubzilla/core!1368 | ||||
| | | * | Update Photo.php | Max Kostikov | 2018-11-05 | 1 | -1/+1 |
| | | | | |||||
| | | * | Use modern get_config() syntax | Max Kostikov | 2018-11-05 | 1 | -4/+2 |
| | |/ | |||||
| | * | Merge branch 'patch-20181028a' into 'dev' | Mario | 2018-11-05 | 6 | -20/+157 |
| | |\ | | | | | | | | | | | | | | | | | Add timestamp to pconfig See merge request hubzilla/core!1355 | ||||
| | | * | strpos needs to test with ===0 not ==0 | M.Dent | 2018-11-01 | 1 | -3/+3 |
| | | | | |||||
| | | * | Add tracking of deleted pconfig variables | M.Dent | 2018-10-29 | 1 | -4/+40 |
| | | | | |||||
| | | * | Fix to set update time in pconfig on update | M.Dent | 2018-10-28 | 1 | -3/+3 |
| | | | | |||||
| | | * | Add timestamp and associated logic to pconfig | M.Dent | 2018-10-28 | 3 | -16/+90 |
| | | | | |||||
| | | * | DB Updates to prep for pconfig timestamps. | M.Dent | 2018-10-28 | 3 | -1/+28 |
| | | | | |||||
| | * | | update changelog and bump version | Mario Vavti | 2018-11-05 | 2 | -1/+15 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-11-05 | 3 | -129/+319 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'dev' into 'dev' | Mario | 2018-11-05 | 2 | -2/+6 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | more fixes for forum notifications handling: do not count likes/dislikes if… See merge request hubzilla/core!1367 | ||||
| | | * | | | more fixes for forum notifications handling: do not count likes/dislikes if ↵ | Mario Vavti | 2018-11-03 | 2 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | likes notifications are disabled and also do not show like activities when clicking a forum notification and like notifications are disabled | ||||
| * | | | | | signature issue | zotlabs | 2018-11-06 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | fix signatures | zotlabs | 2018-11-06 | 2 | -2/+2 |
| | | | | | | |||||
* | | | | | | this is brutal | zotlabs | 2018-11-06 | 10 | -124/+397 |
| | | | | | | |||||
* | | | | | | more zot6 work | zotlabs | 2018-11-05 | 2 | -18/+43 |
| | | | | | | |||||
* | | | | | | populate new fields | zotlabs | 2018-11-05 | 2 | -16/+47 |
| | | | | | | |||||
* | | | | | | z6 work | zotlabs | 2018-11-05 | 4 | -5/+15 |
|/ / / / / | |||||
* | | / / | these changes needed to ensure cloning/syncing works in the future to ↵ | zotlabs | 2018-11-05 | 2 | -44/+94 |
| |_|/ / |/| | | | | | | | | | | | non-zot6 enabled servers after the (coming) zot6 schema updates. This should probably be on a fast track to master branch | ||||
* | | | | debug zot6 discovery | zotlabs | 2018-11-04 | 1 | -118/+283 |
| | | | | |||||
* | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-11-04 | 5 | -8/+13 |
|\| | | | |||||
| * | | | Merge branch 'dev' into 'dev' | Mario | 2018-11-03 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | Fixed typo at view/es-es/hstrings.php See merge request hubzilla/core!1366 | ||||
| | * | | Fixed typo at view/es-es/hstrings.php | Manuel Jiménez Friaza | 2018-11-03 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge branch 'patch-3' into 'dev' | Mario | 2018-11-03 | 1 | -3/+3 |
| |\ \ | | | | | | | | | | | | | | | | | Update hmessages.po See merge request hubzilla/core!1365 | ||||
| | * | | Update hmessages.po | gia vec | 2018-11-02 | 1 | -3/+3 |
| | | | |