aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* clean up whitespace and remove superfluous semicolonMario Vavti2019-01-291-18/+20
* Merge branch 'dev' into 'dev'Mario2019-01-291-15/+35
|\
| * Custom sessionhandler support, as requestedMark Nowiasz2019-01-291-15/+35
* | Revert "Make session handler pluggable"Mario2019-01-291-20/+9
* | Revert "fix wrong function name and coding style"Mario2019-01-291-1/+1
* | fix wrong function name and coding styleMario Vavti2019-01-291-1/+1
* | Merge branch 'sessionhandlerhook' into 'dev'Mario2019-01-291-9/+20
|\ \
| * | Make session handler pluggableDM42.Net (Matt Dent)2019-01-281-9/+20
* | | Merge branch 'boot' into 'dev'Mario2019-01-291-14/+12
|\ \ \
| * | | Correct variable in boot.phpKlaus Weidenbach2019-01-281-14/+12
| |/ /
* | | Merge branch 'doku' into 'dev'Mario2019-01-294-172/+266
|\ \ \
| * | | Extend documentation.Klaus Weidenbach2019-01-284-172/+266
| |/ /
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-292-0/+16
|\ \ \ | |/ / |/| |
| * | disable hyperdrive in hubzillazotlabs2019-01-281-0/+5
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2019-01-2827-1148/+1486
| |\ \
| * | | block private reshares from zot6 due to different parentszotlabs2019-01-281-0/+11
* | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-282-0/+6
|\| | | | |/ / |/| |
| * | share fixeszotlabs2019-01-272-0/+6
* | | Merge branch 'core_fixes' into 'dev'M. Dent2019-01-282-1/+6
|\ \ \
| * | | update nginx and lighttpd sample server configs to explicit dissalow access t...Mario Vavti2019-01-272-1/+6
* | | | Merge branch 'patch-20190125a' into 'dev'Mario2019-01-271-12/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Remove extraneous sync logicM. Dent2019-01-271-12/+2
|/ / /
* | / Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-271-0/+60
|\| | | |/ |/|
| * cleanup of cli admin toolzotlabs2019-01-261-5/+1
| * command line tool for managing site adminszotlabs2019-01-261-0/+64
* | Merge branch 'core_fixes' into 'dev'M. Dent2019-01-261-2/+1
|\ \
| * | return false if http signatue is not validMario Vavti2019-01-251-2/+1
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-01-252-701/+862
|\ \ \
| * | | Update hstrings.phpMax Kostikov2019-01-251-8/+37
| * | | Update hmessages.poMax Kostikov2019-01-251-693/+825
* | | | bump versionMario Vavti2019-01-251-1/+1
| |/ / |/| |
* | | Merge branch 'apidocpublishing' into 'dev'Mario2019-01-252-1/+29
|\ \ \
| * | | Publish doxygen API documentation at gitlab pages.Klaus Weidenbach2019-01-242-1/+29
* | | | Merge branch 'doku' into 'dev'Mario2019-01-2512-273/+351
|\ \ \ \
| * | | | Correct and extend Doxygen comments.Klaus Weidenbach2019-01-2312-273/+351
* | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-252-1/+37
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | support photo items between zot and zot6zotlabs2019-01-242-1/+37
* | | | | Merge branch 'js_fixes' into 'dev'Max Kostikov2019-01-241-2/+2
|\ \ \ \ \
| * | | | | possibly more page jumping fixesMario Vavti2019-01-241-2/+2
* | | | | | Merge branch 'zot6_fixes' into 'dev'Max Kostikov2019-01-241-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | macke mod chanview aware of zot6Mario Vavti2019-01-241-1/+1
* | | | | | Merge branch 'js_fixes' into 'dev'Max Kostikov2019-01-241-2/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | / / | |_|_|/ / |/| | | |
| * | | | fix page jumping when liking a collapsed/expanded postMario Vavti2019-01-231-2/+2
| |/ / /
* | | | Merge branch 'prepare_text' into 'dev'Mario2019-01-231-27/+34
|\ \ \ \
| * | | | Correct parameter in include/text.php prepare_text()Klaus Weidenbach2019-01-221-27/+34
| |/ / /
* | | | Merge branch 'dev' into 'dev'Mario2019-01-231-0/+3
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Skip tags detection in URLMax Kostikov2019-01-221-0/+3
* | | Merge branch 'embedphotos' into 'dev'Mario2019-01-221-53/+69
|\ \ \
| * | | Try to fix some warnings in Zotlabs\Module\Embedphotos.Klaus Weidenbach2019-01-221-53/+69
* | | | Merge branch 'patch-20190114a' into 'dev'Mario2019-01-222-2/+10
|\ \ \ \