aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into 'dev'Mario2019-03-041-2/+2
|\
| * Addressing new 'support@zotadel.net' support forum instead of old 'support@gr...mike2019-03-031-2/+2
* | Merge branch 'core_fixes' into 'dev'M. Dent2019-03-031-1/+1
|\ \
| * | while in legacy zot $sender is expected to be an array, in zot6 $sender is ex...Mario Vavti2019-03-021-1/+1
|/ /
* | Merge branch 'dev' into 'dev'Mario2019-03-021-1/+1
|\|
| * Mention php-zip module dependency in administrator guidemike2019-03-021-1/+1
* | Merge branch 'patch-20190301a' into 'dev'Mario2019-03-021-1/+1
|\ \ | |/ |/|
| * Use sender hashDM42.Net (Matt Dent)2019-03-011-1/+1
* | Merge branch 'js_fixes' into 'dev'M. Dent2019-03-011-5/+11
|\ \ | |/ |/|
| * iron out some kinks with scrollToItem() in combination with collapsed content...Mario Vavti2019-03-011-5/+11
|/
* use $channel_id until the function is adapted to not need itMario Vavti2019-02-261-1/+1
* Merge branch 'fix-sync_an_item' into 'dev'Mario2019-02-261-1/+1
|\
| * xchan_query and fetch_post_tags uses full query results not a single rowDM42.Net (Matt Dent)2019-02-231-3/+3
| * Fixes - sync item based on item's userDM42.Net (Matt Dent)2019-02-231-4/+4
| * Fix misspelled variableDM42.Net (Matt Dent)2019-02-231-1/+1
* | Merge branch 'dev' into 'dev'Mario2019-02-253-19/+88
|\ \
| * | 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
* | | Merge branch 'js_fixes' into 'dev'M. Dent2019-02-243-10/+18
|\ \ \ | |_|/ |/| |
| * | fix regression from commit 04ec35d9cc39cbf62c8db2818574c1f6d56f2a20 where sel...Mario Vavti2019-02-233-10/+18
|/ /
* | Merge branch 'php' into 'dev'Mario2019-02-221-31/+30
|\ \
| * | Update PHP Version check during Setup.Klaus Weidenbach2019-02-211-31/+30
* | | Merge branch 'es-es' into 'dev'Max Kostikov2019-02-220-0/+0
|\ \ \ | |/ / |/| |
| * | Merge branch 'cherry-pick-f92d2e3f' into 'es-es'Manuel Jiménez Friaza2019-02-211-1/+1
| |\ \
| | * | Quickfix es-es/hstrings.phpManuel Jiménez Friaza2019-02-211-1/+1
| |/ /
| * | Merge branch 'cherry-pick-a9b75d05' into 'es-es'Manuel Jiménez Friaza2019-02-211-1/+1
| |\ \
| | * | Fix es-es/hstrings.phpManuel Jiménez Friaza2019-02-211-1/+1
| |/ /
* | | Merge branch 'es-es' into 'dev'Mario2019-02-212-1644/+1992
|\| |
| * | Merge branch 'cherry-pick-e6f289de' into 'es-es'Manuel Jiménez Friaza2019-02-212-1644/+1992
| |\ \
| | * | Update Spanish translationManuel Jiménez Friaza2019-02-212-1644/+1992
| |/ /
* | | Merge branch 'core_fixes' into 'dev'M. Dent2019-02-212-2/+7
|\ \ \
| * | | fix summary and use item_normal_search() for viewsrc so we can also view the ...Mario Vavti2019-02-212-2/+7
|/ / /
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2019-02-202-14066/+13995
|\ \ \
| * \ \ Merge branch 'dev' into 'dev'Max Kostikov2019-02-202-14066/+13995
| |\ \ \
| | * | | 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
|\ \ \ | | |/ | |/|
| * | 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
| |/ / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 05:53:14 +0000