aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \
| * | | | Add remaining hook insertionsM. Dent2019-01-222-2/+10
|/ / / /
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2019-01-212-50/+48
|\| | |
| * | | Merge branch 'dev' into 'dev'M. Dent2019-01-191-14/+12
| |\ \ \
| | * | | Some fixes in include/help.php.Klaus Weidenbach2019-01-181-14/+12
| * | | | Merge branch 'bugfix-plugin' into 'dev'M. Dent2019-01-191-36/+36
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix wrong variable name in include/plugin.php.Klaus Weidenbach2019-01-191-36/+36
| |/ / /
* | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-211-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | comment permission fixzotlabs2019-01-201-1/+1
* | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-182-15/+26
|\| | | | |/ / |/| |
| * | more specific network checking in several places and remove some old debuggin...zotlabs2019-01-171-11/+13
| * | this should fix the rest of the event stuffzotlabs2019-01-171-4/+13
* | | Merge branch 'QA' into 'dev'Mario2019-01-182-22/+58
|\ \ \
| * | | Add PostgreSQL to gitlab-ci setup.Klaus Weidenbach2019-01-172-22/+58
| |/ /
* | | Merge branch 'dreport_fixes' into 'dev'M. Dent2019-01-183-2/+8
|\ \ \
| * | | add spaceMario Vavti2019-01-171-1/+1
| * | | fix delivery report for zot6 connectionsMario Vavti2019-01-173-2/+8
* | | | Merge branch 'core_fixes' into 'dev'M. Dent2019-01-181-0/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | possible fix for #1326Mario Vavti2019-01-171-0/+3
|/ / /
* / / channel connect issuezotlabs2019-01-171-1/+1
|/ /
* | event attendance testing continued (now works at a basic level from one direc...zotlabs2019-01-161-1/+1
* | more z6 event workzotlabs2019-01-161-1/+27