| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'affinity_fixes' into 'dev' | M. Dent | 2019-02-14 | 5 | -119/+94 |
| |\ | | | | | | | | | affinity tool fixes See merge request hubzilla/core!1511 | ||||
| | * | affinity tool fixes | Mario Vavti | 2019-02-14 | 5 | -119/+94 |
| | | | |||||
| * | | Merge branch 'disable_repeats' into 'dev' | M. Dent | 2019-02-14 | 1 | -1/+2 |
| |\ \ | |/ |/| | | | | | disable repeats until issues are resolved See merge request hubzilla/core!1512 | ||||
| | * | disable repeats until issues are resolved | Mario Vavti | 2019-02-14 | 1 | -1/+2 |
| |/ | |||||
| * | Merge branch 'aff2' into 'dev' | Mario | 2019-02-14 | 6 | -8/+91 |
| |\ | | | | | | | | | affinity slider as app See merge request hubzilla/core!1449 | ||||
| | * | affinity slider as app | phani00 | 2019-02-14 | 6 | -8/+91 |
| |/ | |||||
| * | Merge branch 'patch-20190212a' into 'dev' | Mario | 2019-02-13 | 1 | -3/+6 |
| |\ | | | | | | | | | Fix: only first lock red with privacy_warning See merge request hubzilla/core!1510 | ||||
| | * | 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 |
| |/ | |||||
| * | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-02-12 | 2 | -545/+693 |
| |\ | | | | | | | | | Update Russian translayion See merge request hubzilla/core!1509 | ||||
| | * | Update hstrings.php | Max Kostikov | 2019-02-12 | 1 | -45/+72 |
| | | | |||||
| | * | Update hmessages.po | Max Kostikov | 2019-02-12 | 1 | -500/+621 |
| | | | |||||
| * | | Merge branch 'fix-20190211a' into 'dev' | Mario | 2019-02-12 | 1 | -2/+2 |
| |\ \ | | | | | | | | | | | | | Get all listeners See merge request hubzilla/core!1508 | ||||
| | * | | 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 | 14 | -20/+81 |
| |\ \ | |||||
| | * | | exec updateInit() instead of notificationsUpdate() in jotShare() | Mario Vavti | 2019-02-07 | 1 | -2/+1 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-02-07 | 8 | -57/+128 |
| | |\ \ | |||||
| | * \ \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-02-06 | 2 | -13/+29 |
| | |\ \ \ | |||||
| | * \ \ \ | 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 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 |
| | | | | | | | |||||
| * | | | | | | 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 | 3 | -0/+216 |
| | | | | | | | |||||
| * | | | | | | 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 | 7 | -56/+126 |
| | |_|_|/ |/| | | | |||||
| * | | | | 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. | ||||
| * | | | 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. | ||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2019-01-30 | 6 | -198/+312 |
| |\ \ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |