Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'photo_driver_refactor' into 'dev' | Mario | 2019-02-18 | 7 | -877/+1145 | |
|\ \ \ | ||||||
| * | | | Remove duplicate code in PhotoDriver classes. | Klaus Weidenbach | 2019-02-14 | 3 | -38/+32 | |
| * | | | Refactor photo_driver to use namespaces. | Klaus Weidenbach | 2019-02-14 | 7 | -684/+929 | |
| * | | | 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. | Klaus Weidenbach | 2019-02-17 | 1 | -19/+50 | |
| | |/ / | |/| | | ||||||
* | | | | Merge branch 'dev' into 'dev' | Mario | 2019-02-18 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | 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 | Mario | 2019-02-15 | 1 | -1/+4 | |
* | | | | | Merge branch 'rm_addon_settings' into 'dev' | M. Dent | 2019-02-15 | 1 | -7/+0 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | 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 | 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 | Mario Vavti | 2019-02-14 | 1 | -1/+2 | |
|/ / / / | ||||||
* | | | | Merge branch 'aff2' into 'dev' | Mario | 2019-02-14 | 6 | -8/+91 | |
|\ \ \ \ | ||||||
| * | | | | affinity slider as app | phani00 | 2019-02-14 | 6 | -8/+91 | |
|/ / / / | ||||||
* | | | | Merge branch 'patch-20190212a' into 'dev' | Mario | 2019-02-13 | 1 | -3/+6 | |
|\ \ \ \ | ||||||
| * | | | | 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 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 | 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 | 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 | 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 | 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 | 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 | 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 | Mario | 2019-01-31 | 1 | -2/+2 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-01-31 | 2 | -4/+4 | |
| |\| | | | | | |