aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* allow conversation completion for new comments to expired posts, regardless ↵zotlabs2019-02-052-13/+29
| | | | | | of hyperdrive settings. Note that hyperdrive conversations may still be fetched from zap/osada servers but will be ignored.
* update tests for changes in handle_tags()zotlabs2019-02-031-13/+4
|
* fix linkify_tags() so it works with xchans across multiple protocols, also ↵zotlabs2019-02-0311-84/+135
| | | | some fixes to activity parsing from upstream.
* Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2019-01-306-198/+312
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-302-0/+39
| |\
| * | 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 requested See merge request hubzilla/core!1497
| | * | Custom sessionhandler support, as requestedMark Nowiasz2019-01-291-15/+35
| | | |
| * | | Revert "Make session handler pluggable"Mario2019-01-291-20/+9
| | | | | | | | | | | | This reverts commit 8972ca8134c16039c03ad83d26b75b9e9e21d7ea
| * | | Revert "fix wrong function name and coding style"Mario2019-01-291-1/+1
| | | | | | | | | | | | This reverts commit 456207b4e75ee4b28b60e90b44ef758dc95b2ebc
| * | | 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 pluggable See merge request hubzilla/core!1494
| | * | | 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.php See merge request hubzilla/core!1495
| | * | | | Correct variable in boot.phpKlaus Weidenbach2019-01-281-14/+12
| | |/ / /
| * | | | Merge branch 'doku' into 'dev'Mario2019-01-294-172/+266
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Extend documentation. See merge request hubzilla/core!1496
| | * | | | Extend documentation.Klaus Weidenbach2019-01-284-172/+266
| | |/ / /
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-292-0/+16
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-282-0/+6
| |\ \ \ \
* | | | | | set document title when title changes on a page updatezotlabs2019-01-301-0/+1
| |_|_|_|/ |/| | | |
* | | | | cache embeds in the background on initial storage rather than on first accesszotlabs2019-01-292-0/+39
| |_|/ / |/| | |
* | | | disable hyperdrive in hubzillazotlabs2019-01-281-0/+5
| | | |
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2019-01-2827-1148/+1486
|\| | |
| * | | Merge branch 'core_fixes' into 'dev'M. Dent2019-01-282-1/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | update nginx and lighttpd sample server configs to explicit dissalow access to util See merge request hubzilla/core!1493
| | * | | update nginx and lighttpd sample server configs to explicit dissalow access ↵Mario Vavti2019-01-272-1/+6
| | | | | | | | | | | | | | | | | | | | to util
| * | | | Merge branch 'patch-20190125a' into 'dev'Mario2019-01-271-12/+2
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Remove extraneous sync logic See merge request hubzilla/core!1490
| | * | | Remove extraneous sync logicM. Dent2019-01-271-12/+2
| |/ / /
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-271-0/+60
| |\ \ \ | | |_|/ | |/| |
| * | | Merge branch 'core_fixes' into 'dev'M. Dent2019-01-261-2/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | return false if http signatue is not valid See merge request hubzilla/core!1489
| | * | | 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 Russian translation See merge request hubzilla/core!1491
| | * | | | 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
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Suggestion: Publish doxygen API documentation at gitlab pages. See merge request hubzilla/core!1488
| | * | | | Publish doxygen API documentation at gitlab pages.Klaus Weidenbach2019-01-242-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create the API documentation with Doxygen and publish it through gitlab-ci as a Gitlab page at: https://hubzilla.frama.io/core This should only happen when master gets updated. Update Doxyfile configuration. Correct image usage. Replace RedMatrix with Hubzilla icon.
| * | | | | Merge branch 'doku' into 'dev'Mario2019-01-2512-273/+351
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct and extend Doxygen comments. See merge request hubzilla/core!1485
| | * | | | | Correct and extend Doxygen comments.Klaus Weidenbach2019-01-2312-273/+351
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct some documentation errors for Doxygen and add more comments. Document some undefined variables with @FIXME.
| * | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-252-1/+37
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'js_fixes' into 'dev'Max Kostikov2019-01-241-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | possibly more page jumping fixes See merge request hubzilla/core!1486
| | * | | | | | | 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 zot6 See merge request hubzilla/core!1487
| | * | | | | | | 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 post See merge request hubzilla/core!1484
| | * | | | | | 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() See merge request hubzilla/core!1483
| | * | | | | | Correct parameter in include/text.php prepare_text()Klaus Weidenbach2019-01-221-27/+34
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Also extend documentation.
| * | | | | | Merge branch 'dev' into 'dev'Mario2019-01-231-0/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | | Skip tags detection in URL See merge request hubzilla/core!1482
| | * | | | 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. See merge request hubzilla/core!1481