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 | 1 | -0/+186 |
|/ | |||||
* | 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 |
| | | | |||||
* | | | missing use app | Mario Vavti | 2019-02-14 | 1 | -0/+1 |
| | | | |||||
* | | | affinity tool fixes | Mario Vavti | 2019-02-14 | 2 | -72/+54 |
| | | | |||||
* | | | affinity slider as app | phani00 | 2019-02-14 | 3 | -4/+75 |
| | | | |||||
* | | | 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 | 2 | -5/+10 |
|\ \ \ | |||||
| * \ \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-02-07 | 3 | -53/+106 |
| |\ \ \ | |||||
| * \ \ \ | 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 | 6 | -22/+22 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | 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 |
| | |_|/ / | |/| | | | |||||
* | | | | | disable repeat unless mid is a resolvable uri since this will do radically ↵ | zotlabs | 2019-02-07 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+144 |
| | | | | | |||||
* | | | | | 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 | 2 | -52/+104 |
| |/ / |/| | | |||||
* | | | fix linkify_tags() so it works with xchans across multiple protocols, also ↵ | zotlabs | 2019-02-03 | 6 | -22/+22 |
|/ / | | | | | | | some fixes to activity parsing from upstream. | ||||
* | | Extend documentation. | Klaus Weidenbach | 2019-01-28 | 1 | -10/+10 |
| | | |||||
* | | Merge branch 'doku' into 'dev' | Mario | 2019-01-25 | 1 | -6/+10 |
|\ \ | | | | | | | | | | | | | Correct and extend Doxygen comments. See merge request hubzilla/core!1485 | ||||
| * | | Correct and extend Doxygen comments. | Klaus Weidenbach | 2019-01-23 | 1 | -6/+10 |
| | | | | | | | | | | | | | | | | | | Correct some documentation errors for Doxygen and add more comments. Document some undefined variables with @FIXME. | ||||
* | | | 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 |
|/ / | |||||
* | | fix delivery report for zot6 connections | Mario Vavti | 2019-01-17 | 1 | -1/+2 |
| | | |||||
* | | 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 |
| | | |||||
* | | do not count removed channels | Mario Vavti | 2019-01-10 | 1 | -1/+1 |
| | | |||||
* | | fix preg_match(): Delimiter must not be alphanumeric or backslash warning | Mario Vavti | 2019-01-02 | 1 | -1/+1 |
| | | |||||
* | | Faster image processing with photo cache addon | Max Kostikov | 2018-12-24 | 1 | -5/+6 |
| | | |||||
* | | Merge branch 'fix_linkinfo_warning' into 'dev' | Mario | 2018-12-22 | 1 | -3/+3 |
|\ \ | | | | | | | | | | | | | check if we deal with an array before sizeof() See merge request hubzilla/core!1444 | ||||
| * | | use count() instead of sizeof() | Mario Vavti | 2018-12-19 | 1 | -1/+1 |
| | | | |||||
| * | | check if we deal with an array before sizeof() | Mario Vavti | 2018-12-19 | 1 | -3/+3 |
| | | | |||||
* | | | do not add timestamp to the photo src. caching is handled in mod photo now. | Mario Vavti | 2018-12-21 | 1 | -1/+1 |
| | | | |||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-21 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | like permission issue | zotlabs | 2018-12-20 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-12-17 | 7 | -13/+48 |
| |\ \ | |||||
* | | | | missing observer check | Mario Vavti | 2018-12-20 | 1 | -0/+3 |
| | | | | |||||
* | | | | make mod channel deal with b64 encoded mid\s | Mario Vavti | 2018-12-18 | 1 | -0/+8 |
| |_|/ |/| | | | | | | | | ; |