Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | 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 | 4 | -55/+110 | |
| |_|/ / |/| | | | ||||||
* | | | | allow conversation completion for new comments to expired posts, regardless ↵ | zotlabs | 2019-02-05 | 1 | -12/+28 | |
| |/ / |/| | | | | | | | | | | | | | | of hyperdrive settings. Note that hyperdrive conversations may still be fetched from zap/osada servers but will be ignored. | |||||
* | | | fix linkify_tags() so it works with xchans across multiple protocols, also ↵ | zotlabs | 2019-02-03 | 7 | -24/+27 | |
|/ / | | | | | | | some fixes to activity parsing from upstream. | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-30 | 1 | -0/+27 | |
|\ \ | ||||||
| * | | cache embeds in the background on initial storage rather than on first access | zotlabs | 2019-01-29 | 1 | -0/+27 | |
| | | | ||||||
* | | | 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 'doku' into 'dev' | Mario | 2019-01-29 | 2 | -146/+249 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | Extend documentation. See merge request hubzilla/core!1496 | |||||
| * | | | | Extend documentation. | Klaus Weidenbach | 2019-01-28 | 2 | -146/+249 | |
| |/ / / | ||||||
| * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-28 | 2 | -0/+6 | |
| |\ \ \ | ||||||
* | | | | | 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 | 9 | -213/+234 | |
|\| | | | | ||||||
| * | | | | Remove extraneous sync logic | M. Dent | 2019-01-27 | 1 | -12/+2 | |
| | |/ / | |/| | | ||||||
| * | | | return false if http signatue is not valid | Mario Vavti | 2019-01-25 | 1 | -2/+1 | |
| | | | | ||||||
| * | | | Merge branch 'doku' into 'dev' | Mario | 2019-01-25 | 4 | -143/+146 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Correct and extend Doxygen comments. See merge request hubzilla/core!1485 | |||||
| | * | | | Correct and extend Doxygen comments. | Klaus Weidenbach | 2019-01-23 | 4 | -143/+146 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| |\ \ \ \ | ||||||
| * | | | | | macke mod chanview aware of zot6 | Mario Vavti | 2019-01-24 | 1 | -1/+1 | |
| | |/ / / | |/| | | | ||||||
| * | | | | 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. | |||||
| * | | | | | Add remaining hook insertions | M. Dent | 2019-01-22 | 1 | -2/+9 | |
| | | | | | | ||||||
| * | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-21 | 1 | -1/+1 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-18 | 1 | -11/+13 | |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||||
| * | | | | | | Merge branch 'dreport_fixes' into 'dev' | M. Dent | 2019-01-18 | 3 | -2/+8 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix delivery report for zot6 connections See merge request hubzilla/core!1476 | |||||
| | * | | | | | | add space | Mario Vavti | 2019-01-17 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | fix delivery report for zot6 connections | Mario Vavti | 2019-01-17 | 3 | -2/+8 | |
| | | | | | | | | ||||||
* | | | | | | | | block private reshares from zot6 due to different parents | zotlabs | 2019-01-28 | 1 | -0/+11 | |
| |_|_|_|_|/ / |/| | | | | | | ||||||
* | | | | | | | share fixes | zotlabs | 2019-01-27 | 2 | -0/+6 | |
| |_|_|_|/ / |/| | | | | | ||||||
* | | | | | | support photo items between zot and zot6 | zotlabs | 2019-01-24 | 2 | -1/+37 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | comment permission fix | zotlabs | 2019-01-20 | 1 | -1/+1 | |
| |_|/ / |/| | | | ||||||
* | | | | more specific network checking in several places and remove some old ↵ | zotlabs | 2019-01-17 | 1 | -11/+13 | |
|/ / / | | | | | | | | | | debugging crud | |||||
* / / | channel connect issue | zotlabs | 2019-01-17 | 1 | -1/+1 | |
|/ / | ||||||
* | | event attendance testing continued (now works at a basic level from one ↵ | zotlabs | 2019-01-16 | 1 | -1/+1 | |
| | | | | | | | | direction, more testing needed) | |||||
* | | more z6 event work | zotlabs | 2019-01-16 | 1 | -1/+27 | |
| | | ||||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2019-01-16 | 13 | -141/+89 | |
|\ \ | ||||||
| * | | change logic for consistency | Mario Vavti | 2019-01-16 | 1 | -3/+6 | |
| | | | ||||||
| * | | fix legacy zot dreport not passing the is_storable check | Mario Vavti | 2019-01-15 | 2 | -2/+16 | |
| | | | ||||||
| * | | Remove stray $ | DM42.Net (Matt Dent) | 2019-01-13 | 1 | -1/+1 | |
| | | | ||||||
| * | | Add privacygroup_extras_post/drop hooks | DM42.Net (Matt Dent) | 2019-01-13 | 1 | -1/+8 | |
| | | | ||||||
| * | | Add pgrp_extras hook & display | DM42.Net (Matt Dent) | 2019-01-13 | 1 | -0/+5 | |
| | | | ||||||
| * | | Use dba_driver.php::db_getfunc() | DM42.Net (Matt Dent) | 2019-01-11 | 1 | -10/+2 | |
| | | | ||||||
| * | | Fix for PGSQL/MYSQL difference | DM42.Net (Matt Dent) | 2019-01-10 | 1 | -2/+11 | |
| | | |