| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | fix linkify_tags() so it works with xchans across multiple protocols, also ↵ | zotlabs | 2019-02-03 | 11 | -84/+135 |
| | | | | | some fixes to activity parsing from upstream. | ||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2019-01-30 | 6 | -198/+312 |
| |\ | |||||
| | * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-30 | 2 | -0/+39 |
| | |\ | |||||
| | * | | clean up whitespace and remove superfluous semicolon | Mario Vavti | 2019-01-29 | 1 | -18/+20 |
| | | | | |||||
| | * | | Merge branch 'dev' into 'dev' | Mario | 2019-01-29 | 1 | -15/+35 |
| | |\ \ | | | | | | | | | | | | | | | | | Custom sessionhandler support, as requested See merge request hubzilla/core!1497 | ||||
| | | * | | Custom sessionhandler support, as requested | Mark Nowiasz | 2019-01-29 | 1 | -15/+35 |
| | | | | | |||||
| | * | | | Revert "Make session handler pluggable" | Mario | 2019-01-29 | 1 | -20/+9 |
| | | | | | | | | | | | | | This reverts commit 8972ca8134c16039c03ad83d26b75b9e9e21d7ea | ||||
| | * | | | Revert "fix wrong function name and coding style" | Mario | 2019-01-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | This reverts commit 456207b4e75ee4b28b60e90b44ef758dc95b2ebc | ||||
| | * | | | fix wrong function name and coding style | Mario Vavti | 2019-01-29 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'sessionhandlerhook' into 'dev' | Mario | 2019-01-29 | 1 | -9/+20 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Make session handler pluggable See merge request hubzilla/core!1494 | ||||
| | | * | | | Make session handler pluggable | DM42.Net (Matt Dent) | 2019-01-28 | 1 | -9/+20 |
| | | | | | | |||||
| | * | | | | Merge branch 'boot' into 'dev' | Mario | 2019-01-29 | 1 | -14/+12 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Correct variable in boot.php See merge request hubzilla/core!1495 | ||||
| | | * | | | | Correct variable in boot.php | Klaus Weidenbach | 2019-01-28 | 1 | -14/+12 |
| | | |/ / / | |||||
| | * | | | | Merge branch 'doku' into 'dev' | Mario | 2019-01-29 | 4 | -172/+266 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Extend documentation. See merge request hubzilla/core!1496 | ||||
| | | * | | | | Extend documentation. | Klaus Weidenbach | 2019-01-28 | 4 | -172/+266 |
| | | |/ / / | |||||
| | * | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-29 | 2 | -0/+16 |
| | |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-28 | 2 | -0/+6 |
| | |\ \ \ \ | |||||
| * | | | | | | set document title when title changes on a page update | zotlabs | 2019-01-30 | 1 | -0/+1 |
| | |_|_|_|/ |/| | | | | |||||
| * | | | | | cache embeds in the background on initial storage rather than on first access | zotlabs | 2019-01-29 | 2 | -0/+39 |
| | |_|/ / |/| | | | |||||
| * | | | | 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 |
| |\| | | | |||||
| | * | | | 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 to util See merge request hubzilla/core!1493 | ||||
| | | * | | | update nginx and lighttpd sample server configs to explicit dissalow access ↵ | Mario Vavti | 2019-01-27 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | to util | ||||
| | * | | | | Merge branch 'patch-20190125a' into 'dev' | Mario | 2019-01-27 | 1 | -12/+2 |
| | |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Remove extraneous sync logic See merge request hubzilla/core!1490 | ||||
| | | * | | | 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 |
| | |\ \ \ | | |_|/ | |/| | | |||||
| | * | | | Merge branch 'core_fixes' into 'dev' | M. Dent | 2019-01-26 | 1 | -2/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | return false if http signatue is not valid See merge request hubzilla/core!1489 | ||||
| | | * | | | 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 Russian translation See merge request hubzilla/core!1491 | ||||
| | | * | | | | 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 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Suggestion: Publish doxygen API documentation at gitlab pages. See merge request hubzilla/core!1488 | ||||
| | | * | | | | Publish doxygen API documentation at gitlab pages. | Klaus Weidenbach | 2019-01-24 | 2 | -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' | Mario | 2019-01-25 | 12 | -273/+351 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct and extend Doxygen comments. See merge request hubzilla/core!1485 | ||||
| | | * | | | | | Correct and extend Doxygen comments. | Klaus Weidenbach | 2019-01-23 | 12 | -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 dev | Mario Vavti | 2019-01-25 | 2 | -1/+37 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'js_fixes' into 'dev' | Max Kostikov | 2019-01-24 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | possibly more page jumping fixes See merge request hubzilla/core!1486 | ||||
| | | * | | | | | | | 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 See merge request hubzilla/core!1487 | ||||
| | | * | | | | | | | 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 See merge request hubzilla/core!1484 | ||||
| | | * | | | | | | 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() See merge request hubzilla/core!1483 | ||||
| | | * | | | | | | Correct parameter in include/text.php prepare_text() | Klaus Weidenbach | 2019-01-22 | 1 | -27/+34 |
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | Also extend documentation. | ||||
| | * | | | | | | Merge branch 'dev' into 'dev' | Mario | 2019-01-23 | 1 | -0/+3 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | | | Skip tags detection in URL See merge request hubzilla/core!1482 | ||||
| | | * | | | | 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. See merge request hubzilla/core!1481 | ||||
| | | * | | | | | Try to fix some warnings in Zotlabs\Module\Embedphotos. | Klaus Weidenbach | 2019-01-22 | 1 | -53/+69 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $phototypes was undefined, hope this is correct selection to fix it. Correct Doxygen and clean up some variables and refactoring. | ||||
| | * | | | | | | Merge branch 'patch-20190114a' into 'dev' | Mario | 2019-01-22 | 2 | -2/+10 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add remaining hook insertions See merge request hubzilla/core!1471 | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |