Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://framagit.org/zot/core into dev | zotlabs | 2019-02-19 | 1 | -3/+2 |
|\ | |||||
| * | if local_channel() and updating the page do not query for another item if ↵ | Mario Vavti | 2019-02-18 | 1 | -3/+2 |
| | | | | | | | | the first query returned no results. we will most probably find an item from another channel (e.g. after liking a comment) and end up with multiple items with the same mid from different channels after the page update | ||||
* | | mod_id should return object not collection | zotlabs | 2019-02-19 | 1 | -76/+9 |
| | | |||||
* | | support zot location independent urls | zotlabs | 2019-02-18 | 4 | -22/+320 |
|/ | |||||
* | Merge branch 'photo_driver_refactor' into 'dev' | Mario | 2019-02-18 | 3 | -0/+874 |
|\ | | | | | | | | | Photo driver refactor See merge request hubzilla/core!1515 | ||||
| * | Remove duplicate code in PhotoDriver classes. | Klaus Weidenbach | 2019-02-14 | 3 | -38/+32 |
| | | | | | | | | | | cropImage is just a special case of cropImageRect, no need to duplicate all the code. | ||||
| * | Refactor photo_driver to use namespaces. | Klaus Weidenbach | 2019-02-14 | 3 | -0/+880 |
| | | | | | | | | Add simple UnitTest, but it is not yet very meaningful. | ||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-02-18 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | MySQL 8 admin summary compatibility See merge request hubzilla/core!1517 | ||||
| * | | MySQL 8 admin summary compatibility | Max Kostikov | 2019-02-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'exclude_addon_common' into 'dev' | M. Dent | 2019-02-15 | 1 | -1/+4 |
|\ \ \ | | | | | | | | | | | | | | | | | exclude addon_common from addon list See merge request hubzilla/core!1513 | ||||
| * | | | exclude addon_common from addon list | Mario | 2019-02-15 | 1 | -1/+4 |
| | | | | |||||
* | | | | deprecate addon settings | Mario | 2019-02-15 | 1 | -7/+0 |
| |_|/ |/| | | |||||
* | | | missing use app | Mario Vavti | 2019-02-14 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'affinity_fixes' into 'dev' | M. Dent | 2019-02-14 | 3 | -111/+93 |
|\ \ \ | | | | | | | | | | | | | | | | | affinity tool fixes See merge request hubzilla/core!1511 | ||||
| * | | | affinity tool fixes | Mario Vavti | 2019-02-14 | 3 | -111/+93 |
| | | | | |||||
* | | | | disable repeats until issues are resolved | Mario Vavti | 2019-02-14 | 1 | -1/+2 |
|/ / / | |||||
* | | | affinity slider as app | phani00 | 2019-02-14 | 5 | -8/+85 |
| | | | |||||
* | | | Only cascade privacy warning if thread parent has privacy concerns. | M.Dent | 2019-02-13 | 1 | -5/+2 |
| | | | |||||
* | | | Fix: only first lock red with privacy_warning | M.Dent | 2019-02-12 | 1 | -3/+9 |
| | | | |||||
* | | | Get all listeners | M.Dent | 2019-02-11 | 1 | -2/+2 |
| | | | |||||
* | | | use ACTIVITY_SHARE to match the verb | Mario Vavti | 2019-02-08 | 1 | -1/+1 |
| | | | |||||
* | | | missing use App | Mario Vavti | 2019-02-08 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2019-02-07 | 3 | -7/+23 |
|\ \ \ | |||||
| * \ \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-02-07 | 5 | -56/+112 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-02-06 | 1 | -12/+28 |
| |\ \ \ \ | |||||
| * \ \ \ \ | 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 | 7 | -24/+27 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | 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 |
| | | | | | | | |||||
| * | | | | | | Set lock red and provide warning if a forum is tagged in the post | M. Dent | 2019-02-01 | 1 | -0/+11 |
| | | | | | | | |||||
| * | | | | | | starring and filing is only supported for post item type | Mario | 2019-01-31 | 1 | -2/+2 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | disable repeat unless mid is a resolvable uri since this will do radically ↵ | zotlabs | 2019-02-07 | 2 | -6/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | different things on different network stacks (e.g. Diaspora) and it turns out there is no possible way to make Diaspora reshares compatible with ActivityPub or Zot6 repeat/announce/boost/whatever. | ||||
* | | | | | | automatically redirect repeat to share for posts with unresolvable ↵ | zotlabs | 2019-02-07 | 1 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | message-ids (diaspora, hz < 4.0, etc.). | ||||
* | | | | | | add missing zot6 conversation completion (required for message repeats) | zotlabs | 2019-02-07 | 2 | -0/+197 |
| | | | | | | |||||
* | | | | | | fix mid generation for shares | zotlabs | 2019-02-07 | 1 | -2/+2 |
| |_|_|/ / |/| | | | | |||||
* | | | | | 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 |