Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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" | Max Kostikov | 2018-11-07 | 1 | -1/+2 |
| |/ | |||||
| * | Merge branch 'patch-25' into 'dev' | M. Dent | 2018-11-06 | 1 | -13/+20 |
| |\ | |||||
| | * | 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 |
| |\ \ | | |/ | |/| | |||||
| | * | 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 |
| |\ | |||||
| | * | 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 |
| |\ | |||||
| | * | 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 l... | Mario Vavti | 2018-11-03 | 2 | -2/+6 |
* | | | | | signature issue | zotlabs | 2018-11-06 | 1 | -1/+1 |
* | | | | | these changes needed to ensure cloning/syncing works in the future to non-zot... | zotlabs | 2018-11-05 | 2 | -44/+94 |
| |_|/ / |/| | | | |||||
* | | | | 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 | 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 | gia vec | 2018-11-02 | 1 | -3/+3 |
| * | | | Merge branch 'patch-2' into 'dev' | Mario | 2018-11-03 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Update hstrings.php | gia vec | 2018-11-02 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Merge branch 'patch-22' into 'dev' | Mario | 2018-11-03 | 1 | -1/+6 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Update Linkinfo.php | Max Kostikov | 2018-11-03 | 1 | -1/+1 |
| | * | | Update Linkinfo.php | Max Kostikov | 2018-11-03 | 1 | -1/+1 |
| | * | | Update Linkinfo.php | Max Kostikov | 2018-11-03 | 1 | -4/+4 |
| | * | | Update Linkinfo.php | Max Kostikov | 2018-11-02 | 1 | -2/+2 |
| | * | | more precise codepage detection | Max Kostikov | 2018-11-02 | 1 | -3/+5 |