| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-29 | 2 | -0/+16 |
|\ |
|
| * | disable hyperdrive in hubzilla | zotlabs | 2019-01-28 | 1 | -0/+5 |
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2019-01-28 | 27 | -1148/+1486 |
| |\ |
|
| * | | block private reshares from zot6 due to different parents | zotlabs | 2019-01-28 | 1 | -0/+11 |
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-28 | 2 | -0/+6 |
|\| |
| |/
|/| |
|
| * | share fixes | zotlabs | 2019-01-27 | 2 | -0/+6 |
* | | Merge branch 'core_fixes' into 'dev' | M. Dent | 2019-01-28 | 2 | -1/+6 |
|\ \ |
|
| * | | update nginx and lighttpd sample server configs to explicit dissalow access t... | Mario Vavti | 2019-01-27 | 2 | -1/+6 |
* | | | Merge branch 'patch-20190125a' into 'dev' | Mario | 2019-01-27 | 1 | -12/+2 |
|\ \ \
| |/ /
|/| | |
|
| * | | Remove extraneous sync logic | M. Dent | 2019-01-27 | 1 | -12/+2 |
|/ / |
|
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-27 | 1 | -0/+60 |
|\| |
|
| * | cleanup of cli admin tool | zotlabs | 2019-01-26 | 1 | -5/+1 |
| * | command line tool for managing site admins | zotlabs | 2019-01-26 | 1 | -0/+64 |
* | | Merge branch 'core_fixes' into 'dev' | M. Dent | 2019-01-26 | 1 | -2/+1 |
|\ \ |
|
| * | | return false if http signatue is not valid | Mario Vavti | 2019-01-25 | 1 | -2/+1 |
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-01-25 | 2 | -701/+862 |
|\ \ \ |
|
| * | | | Update hstrings.php | Max Kostikov | 2019-01-25 | 1 | -8/+37 |
| * | | | Update hmessages.po | Max Kostikov | 2019-01-25 | 1 | -693/+825 |
* | | | | bump version | Mario Vavti | 2019-01-25 | 1 | -1/+1 |
| |/ /
|/| | |
|
* | | | Merge branch 'apidocpublishing' into 'dev' | Mario | 2019-01-25 | 2 | -1/+29 |
|\ \ \ |
|
| * | | | Publish doxygen API documentation at gitlab pages. | Klaus Weidenbach | 2019-01-24 | 2 | -1/+29 |
* | | | | Merge branch 'doku' into 'dev' | Mario | 2019-01-25 | 12 | -273/+351 |
|\ \ \ \ |
|
| * | | | | Correct and extend Doxygen comments. | Klaus Weidenbach | 2019-01-23 | 12 | -273/+351 |
* | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-25 | 2 | -1/+37 |
|\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| * | | | | support photo items between zot and zot6 | zotlabs | 2019-01-24 | 2 | -1/+37 |
* | | | | | Merge branch 'js_fixes' into 'dev' | Max Kostikov | 2019-01-24 | 1 | -2/+2 |
|\ \ \ \ \ |
|
| * | | | | | possibly more page jumping fixes | Mario Vavti | 2019-01-24 | 1 | -2/+2 |
* | | | | | | Merge branch 'zot6_fixes' into 'dev' | Max Kostikov | 2019-01-24 | 1 | -1/+1 |
|\ \ \ \ \ \
| |_|_|_|/ /
|/| | | | | |
|
| * | | | | | macke mod chanview aware of zot6 | Mario Vavti | 2019-01-24 | 1 | -1/+1 |
* | | | | | | Merge branch 'js_fixes' into 'dev' | Max Kostikov | 2019-01-24 | 1 | -2/+2 |
|\ \ \ \ \ \
| | |/ / / /
| |/| | / /
| |_|_|/ /
|/| | | | |
|
| * | | | | fix page jumping when liking a collapsed/expanded post | Mario Vavti | 2019-01-23 | 1 | -2/+2 |
| |/ / / |
|
* | | | | Merge branch 'prepare_text' into 'dev' | Mario | 2019-01-23 | 1 | -27/+34 |
|\ \ \ \ |
|
| * | | | | Correct parameter in include/text.php prepare_text() | Klaus Weidenbach | 2019-01-22 | 1 | -27/+34 |
| |/ / / |
|
* | | | | Merge branch 'dev' into 'dev' | Mario | 2019-01-23 | 1 | -0/+3 |
|\ \ \ \
| |/ / /
|/| | /
| | |/
| |/| |
|
| * | | Skip tags detection in URL | Max Kostikov | 2019-01-22 | 1 | -0/+3 |
* | | | Merge branch 'embedphotos' into 'dev' | Mario | 2019-01-22 | 1 | -53/+69 |
|\ \ \ |
|
| * | | | Try to fix some warnings in Zotlabs\Module\Embedphotos. | Klaus Weidenbach | 2019-01-22 | 1 | -53/+69 |
* | | | | Merge branch 'patch-20190114a' into 'dev' | Mario | 2019-01-22 | 2 | -2/+10 |
|\ \ \ \ |
|
| * | | | | Add remaining hook insertions | M. Dent | 2019-01-22 | 2 | -2/+10 |
|/ / / / |
|
* | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2019-01-21 | 2 | -50/+48 |
|\| | | |
|
| * | | | Merge branch 'dev' into 'dev' | M. Dent | 2019-01-19 | 1 | -14/+12 |
| |\ \ \ |
|
| | * | | | Some fixes in include/help.php. | Klaus Weidenbach | 2019-01-18 | 1 | -14/+12 |
| * | | | | Merge branch 'bugfix-plugin' into 'dev' | M. Dent | 2019-01-19 | 1 | -36/+36 |
| |\ \ \ \
| | |/ / /
| |/| | | |
|
| | * | | | Fix wrong variable name in include/plugin.php. | Klaus Weidenbach | 2019-01-19 | 1 | -36/+36 |
| |/ / / |
|
* | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-21 | 1 | -1/+1 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | comment permission fix | zotlabs | 2019-01-20 | 1 | -1/+1 |
* | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-18 | 2 | -15/+26 |
|\| | |
| |/ /
|/| | |
|
| * | | more specific network checking in several places and remove some old debuggin... | zotlabs | 2019-01-17 | 1 | -11/+13 |
| * | | this should fix the rest of the event stuff | zotlabs | 2019-01-17 | 1 | -4/+13 |
* | | | Merge branch 'QA' into 'dev' | Mario | 2019-01-18 | 2 | -22/+58 |
|\ \ \ |
|