| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/dev' into dev | Manuel Jiménez Friaza | 2019-02-19 | 80 | -4382/+6177 |
| |\ | |||||
| | * | update composer autoload cache | Mario Vavti | 2019-02-19 | 2 | -0/+14 |
| | | | |||||
| | * | update strings | Mario Vavti | 2019-02-19 | 1 | -1506/+1791 |
| | | | |||||
| | * | Merge branch 'patch-20190218a' into 'dev' | Mario | 2019-02-19 | 1 | -0/+2 |
| | |\ | | | | | | | | | | | | | Fix: post_activity_item returns success => true even on failure. See merge request hubzilla/core!1521 | ||||
| | | * | Fix: post_activity_item returns success => true even on failure. | M.Dent | 2019-02-18 | 1 | -0/+2 |
| | | | | |||||
| | * | | Merge branch 'js_fixes' into 'dev' | M. Dent | 2019-02-19 | 1 | -2/+2 |
| | |\ \ | | | | | | | | | | | | | | | | | prevent page jumping on like if comments are expanded (show all x comments) See merge request hubzilla/core!1520 | ||||
| | | * | | prevent page jumping on like if comments are expanded (show all x comments) | Mario Vavti | 2019-02-18 | 1 | -2/+2 |
| | | |/ | |||||
| | * | | Merge branch 'mod_display_fixes' into 'dev' | M. Dent | 2019-02-19 | 1 | -3/+2 |
| | |\ \ | | | | | | | | | | | | | | | | | if local_channel() and updating the page do not query for another item if the... See merge request hubzilla/core!1519 | ||||
| | | * | | 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 | ||||
| | * | | Merge branch 'core_fixes' into 'dev' | M. Dent | 2019-02-19 | 1 | -1/+0 |
| | |\ \ | | |/ | |/| | | | | | | | remove zottel.net from fallback servers. it switched to directory_mode_normal from secondary See merge request hubzilla/core!1518 | ||||
| | | * | remove zottel.net from fallback servers. it switched to ↵ | Mario Vavti | 2019-02-18 | 1 | -1/+0 |
| | | | | | | | | | | | | | directory_mode_normal from secondary | ||||
| | * | | Merge branch 'photo_driver_refactor' into 'dev' | Mario | 2019-02-18 | 7 | -877/+1145 |
| | |\ \ | | | | | | | | | | | | | | | | | 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 | 7 | -684/+929 |
| | | | | | | | | | | | | | | | | | Add simple UnitTest, but it is not yet very meaningful. | ||||
| | | * | | Clean up and documentation in photo_drive. | Klaus Weidenbach | 2019-02-14 | 1 | -242/+271 |
| | | | | | |||||
| | * | | | Merge branch 'QA' into 'dev' | Mario | 2019-02-18 | 1 | -19/+50 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Improve gitlab-ci environment. See merge request hubzilla/core!1516 | ||||
| | | * | | | Improve gitlab-ci environment. | Klaus Weidenbach | 2019-02-17 | 1 | -19/+50 |
| | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | Use a custom Hubzilla image to speed up pipeline. Single test jobs were around 4:30-5:00 minutes, now ~1:30 minute. Improve Composer cache in Gitlab CI/CD. Add more recent databases (MySQL8, MariaDB10.3) to the pipeline. | ||||
| | * | | | 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 |
| | | | | | | |||||
| | * | | | | Merge branch 'rm_addon_settings' into 'dev' | M. Dent | 2019-02-15 | 1 | -7/+0 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | Remove deprecated addon settings See merge request hubzilla/core!1514 | ||||
| | | * | | | 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 | 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 |
| | | | | | | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |