aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | Update Russian hstrings.phpMax Kostikov2019-02-201-2769/+2774
| | | * | | Update Russian hmessages.poMax Kostikov2019-02-201-11297/+11221
| | |/ / /
| * | | | bump dev versionMario Vavti2019-02-201-1/+1
| * | | | bump versionMario Vavti2019-02-201-1/+1
| |/ / /
| * | | Merge branch 'dev' into 'dev'Mario2019-02-208-38/+295
| |\ \ \
* | | | | translate name of content filter (addon) app.zotlabs2019-02-281-0/+1
| |_|_|/ |/| | |
* | | | issues uncovered testing combined item/file importzotlabs2019-02-243-5/+5
* | | | zot api changes to support combined content (items+files) import addonzotlabs2019-02-242-19/+88
| |/ / |/| |
* | | urlencode links in category widgetzotlabs2019-02-191-1/+1
* | | hubzilla has uuid - use that instead of wildcardzotlabs2019-02-191-4/+4
* | | remove extraneous loggingzotlabs2019-02-191-1/+0
* | | fix ability for file storage creators (visitors) to be able to delete their o...zotlabs2019-02-193-15/+42
* | | Merge branch 'dev' of https://framagit.org/zot/core into devzotlabs2019-02-197-1512/+1811
|\| |
| * | update composer autoload cacheMario Vavti2019-02-192-0/+14
| * | update stringsMario Vavti2019-02-191-1506/+1791
| * | Merge branch 'patch-20190218a' into 'dev'Mario2019-02-191-0/+2
| |\ \
| | * | Fix: post_activity_item returns success => true even on failure.M.Dent2019-02-181-0/+2
| * | | Merge branch 'js_fixes' into 'dev'M. Dent2019-02-191-2/+2
| |\ \ \
| | * | | prevent page jumping on like if comments are expanded (show all x comments)Mario Vavti2019-02-181-2/+2
| | |/ /
| * | | Merge branch 'mod_display_fixes' into 'dev'M. Dent2019-02-191-3/+2
| |\ \ \
| | * | | if local_channel() and updating the page do not query for another item if the...Mario Vavti2019-02-181-3/+2
| | |/ /
| * | | Merge branch 'core_fixes' into 'dev'M. Dent2019-02-191-1/+0
| |\ \ \ | | |/ / | |/| |
| | * | remove zottel.net from fallback servers. it switched to directory_mode_normal...Mario Vavti2019-02-181-1/+0
* | | | 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
|\ \ \
| * | | Remove duplicate code in PhotoDriver classes.Klaus Weidenbach2019-02-143-38/+32
| * | | Refactor photo_driver to use namespaces.Klaus Weidenbach2019-02-147-684/+929
| * | | 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.Klaus Weidenbach2019-02-171-19/+50
| | |/ / | |/| |
* | | | Merge branch 'dev' into 'dev'Mario2019-02-181-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | 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 listMario2019-02-151-1/+4
* | | | | Merge branch 'rm_addon_settings' into 'dev'M. Dent2019-02-151-7/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | 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 fixesMario Vavti2019-02-145-119/+94
* | | | | Merge branch 'disable_repeats' into 'dev'M. Dent2019-02-141-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | disable repeats until issues are resolvedMario Vavti2019-02-141-1/+2
|/ / / /
* | | | Merge branch 'aff2' into 'dev'Mario2019-02-146-8/+91
|\ \ \ \
| * | | | affinity slider as appphani002019-02-146-8/+91
|/ / / /
* | | | Merge branch 'patch-20190212a' into 'dev'Mario2019-02-131-3/+6
|\ \ \ \
| * | | | 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 hstrings.phpMax Kostikov2019-02-121-45/+72
| * | | Update hmessages.poMax Kostikov2019-02-121-500/+621