aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* mod_id should return object not collectionzotlabs2019-02-191-76/+9
|
* support zot location independent urlszotlabs2019-02-184-22/+320
|
* Merge branch 'photo_driver_refactor' into 'dev'Mario2019-02-187-877/+1145
|\ | | | | | | | | Photo driver refactor See merge request hubzilla/core!1515
| * Remove duplicate code in PhotoDriver classes.Klaus Weidenbach2019-02-143-38/+32
| | | | | | | | | | cropImage is just a special case of cropImageRect, no need to duplicate all the code.
| * Refactor photo_driver to use namespaces.Klaus Weidenbach2019-02-147-684/+929
| | | | | | | | Add simple UnitTest, but it is not yet very meaningful.
| * Clean up and documentation in photo_drive.Klaus Weidenbach2019-02-141-242/+271
| |
* | Merge branch 'QA' into 'dev'Mario2019-02-181-19/+50
|\ \ | | | | | | | | | | | | Improve gitlab-ci environment. See merge request hubzilla/core!1516
| * | Improve gitlab-ci environment.Klaus Weidenbach2019-02-171-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'Mario2019-02-181-1/+1
|\ \ \ | |/ / |/| | | | | | | | MySQL 8 admin summary compatibility See merge request hubzilla/core!1517
| * | MySQL 8 admin summary compatibilityMax Kostikov2019-02-171-1/+1
| | |
* | | Merge branch 'exclude_addon_common' into 'dev'M. Dent2019-02-151-1/+4
|\ \ \ | | | | | | | | | | | | | | | | exclude addon_common from addon list See merge request hubzilla/core!1513
| * | | exclude addon_common from addon listMario2019-02-151-1/+4
| | | |
* | | | Merge branch 'rm_addon_settings' into 'dev'M. Dent2019-02-151-7/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Remove deprecated addon settings See merge request hubzilla/core!1514
| * | | deprecate addon settingsMario2019-02-151-7/+0
|/ / /
* | | missing use appMario Vavti2019-02-141-0/+1
| | |
* | | Merge branch 'affinity_fixes' into 'dev'M. Dent2019-02-145-119/+94
|\ \ \ | | | | | | | | | | | | | | | | affinity tool fixes See merge request hubzilla/core!1511
| * | | affinity tool fixesMario Vavti2019-02-145-119/+94
| | | |
* | | | Merge branch 'disable_repeats' into 'dev'M. Dent2019-02-141-1/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | disable repeats until issues are resolved See merge request hubzilla/core!1512
| * | | disable repeats until issues are resolvedMario Vavti2019-02-141-1/+2
|/ / /
* | | Merge branch 'aff2' into 'dev'Mario2019-02-146-8/+91
|\ \ \ | | | | | | | | | | | | | | | | affinity slider as app See merge request hubzilla/core!1449
| * | | affinity slider as appphani002019-02-146-8/+91
|/ / /
* | | Merge branch 'patch-20190212a' into 'dev'Mario2019-02-131-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.Dent2019-02-131-5/+2
| | | |
| * | | Fix: only first lock red with privacy_warningM.Dent2019-02-121-3/+9
|/ / /
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-02-122-545/+693
|\ \ \ | | |/ | |/| | | | | | | Update Russian translayion See merge request hubzilla/core!1509
| * | Update hstrings.phpMax Kostikov2019-02-121-45/+72
| | |
| * | Update hmessages.poMax Kostikov2019-02-121-500/+621
| | |
* | | Merge branch 'fix-20190211a' into 'dev'Mario2019-02-121-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Get all listeners See merge request hubzilla/core!1508
| * | | Get all listenersM.Dent2019-02-111-2/+2
|/ / /
* | | use ACTIVITY_SHARE to match the verbMario Vavti2019-02-081-1/+1
| | |
* | | missing use AppMario Vavti2019-02-081-0/+1
| | |
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2019-02-0714-20/+81
|\ \ \
| * | | exec updateInit() instead of notificationsUpdate() in jotShare()Mario Vavti2019-02-071-2/+1
| | | |
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-02-078-57/+128
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'mike/master' into devMario Vavti2019-02-062-13/+29
| |\ \ \ \
| * \ \ \ \ Merge branch 'viewsrc_update' into 'dev'Max Kostikov2019-02-041-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | add the actual mid for debuging reasons See merge request hubzilla/core!1506
| | * | | | | add the actual mid for debuging reasonsMario Vavti2019-02-031-2/+2
| | | | | | |
| * | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-02-0412-97/+139
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | update changelogMario Vavti2019-02-031-0/+10
| | | | | | |
| * | | | | | cleanup logging and return if query returns empty resultMario Vavti2019-02-031-3/+6
| | | | | | |
| * | | | | | do not overwrite $sql_extraMario Vavti2019-02-031-2/+4
| | | | | | |
| * | | | | | Merge branch 'core_fixes' into 'dev'M. Dent2019-02-031-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix #1332 See merge request hubzilla/core!1505
| | * | | | | | fix #1332Mario Vavti2019-02-021-0/+1
| |/ / / / / /
| * | | | | | Merge branch 'patch-20190201a' into 'dev'Mario2019-02-025-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 editorDM42.Net (Matt Dent)2019-02-015-6/+41
| | | | | | | |
| * | | | | | | Merge branch 'dev' into 'dev'M. Dent2019-02-011-1/+1
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | Prevent Hubzilla usage for SEO backlinks See merge request hubzilla/core!1501
| | * | | | | | Prevent Hubzilla usage for SEO backlinksMax Kostikov2019-02-011-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'patch-20190130a' into 'dev'Mario2019-02-011-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 postM. Dent2019-02-011-0/+11
| |/ / / / / /
| * | | | | | Merge branch 'core_fixes' into 'dev'Max Kostikov2019-01-311-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | starring and filing is only supported for post item type See merge request hubzilla/core!1498
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 15:08:13 +0000