| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-02-07 | 8 | -57/+128 |
| |\ | |||||
| | * | fix verb for reshares | zotlabs | 2019-02-06 | 1 | -1/+1 |
| | | | |||||
| | * | more work on share/repeat | zotlabs | 2019-02-06 | 1 | -1/+2 |
| | | | |||||
| | * | work on repeat/share for Hubzilla | zotlabs | 2019-02-06 | 7 | -56/+126 |
| | | | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-02-06 | 2 | -13/+29 |
| |\| | |||||
| | * | allow conversation completion for new comments to expired posts, regardless ↵ | zotlabs | 2019-02-05 | 2 | -13/+29 |
| | | | | | | | | | | | | | of hyperdrive settings. Note that hyperdrive conversations may still be fetched from zap/osada servers but will be ignored. | ||||
| * | | Merge branch 'viewsrc_update' into 'dev' | Max Kostikov | 2019-02-04 | 1 | -2/+2 |
| |\ \ | | | | | | | | | | | | | add the actual mid for debuging reasons See merge request hubzilla/core!1506 | ||||
| | * | | add the actual mid for debuging reasons | Mario Vavti | 2019-02-03 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-02-04 | 12 | -97/+139 |
| |\ \ \ | |/ / |/| / | |/ | |||||
| | * | update tests for changes in handle_tags() | zotlabs | 2019-02-03 | 1 | -13/+4 |
| | | | |||||
| | * | 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. | ||||
| * | | update changelog | Mario Vavti | 2019-02-03 | 1 | -0/+10 |
| | | | |||||
| * | | cleanup logging and return if query returns empty result | Mario Vavti | 2019-02-03 | 1 | -3/+6 |
| | | | |||||
| * | | do not overwrite $sql_extra | Mario Vavti | 2019-02-03 | 1 | -2/+4 |
| | | | |||||
| * | | Merge branch 'core_fixes' into 'dev' | M. Dent | 2019-02-03 | 1 | -0/+1 |
| |\ \ | | | | | | | | | | | | | fix #1332 See merge request hubzilla/core!1505 | ||||
| | * | | fix #1332 | Mario Vavti | 2019-02-02 | 1 | -0/+1 |
| |/ / | |||||
| * | | Merge branch 'patch-20190201a' into 'dev' | Mario | 2019-02-02 | 5 | -6/+41 |
| |\ \ | | | | | | | | | | | | | Add filter hooks and the ability to add buttons to the default status editor See merge request hubzilla/core!1502 | ||||
| | * | | Add filter hooks and the ability to add buttons to the default status editor | DM42.Net (Matt Dent) | 2019-02-01 | 5 | -6/+41 |
| | | | | |||||
| * | | | Merge branch 'dev' into 'dev' | M. Dent | 2019-02-01 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | Prevent Hubzilla usage for SEO backlinks See merge request hubzilla/core!1501 | ||||
| | * | | | Prevent Hubzilla usage for SEO backlinks | Max Kostikov | 2019-02-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'patch-20190130a' into 'dev' | Mario | 2019-02-01 | 1 | -0/+11 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | Set lock red and provide warning if a forum is tagged in the post See merge request hubzilla/core!1499 | ||||
| | * | | | Set lock red and provide warning if a forum is tagged in the post | M. Dent | 2019-02-01 | 1 | -0/+11 |
| |/ / / | |||||
| * | | | Merge branch 'core_fixes' into 'dev' | Max Kostikov | 2019-01-31 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | starring and filing is only supported for post item type See merge request hubzilla/core!1498 | ||||
| | * | | | starring and filing is only supported for post item type | Mario | 2019-01-31 | 1 | -2/+2 |
| |/ / / | |||||
| * | / | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-01-31 | 2 | -4/+4 |
| |\| | | |/ |/| | | | | | Fix typos in Russian translation See merge request hubzilla/core!1500 | ||||
| | * | Update hstrings.php | Max Kostikov | 2019-01-31 | 1 | -2/+2 |
| | | | |||||
| | * | Update hmessages.po | Max Kostikov | 2019-01-31 | 1 | -2/+2 |
| | | | |||||
| * | | 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 | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |