Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-03-04 | 1 | -2/+2 | |
|\ \ | ||||||
| * | | Addressing new 'support@zotadel.net' support forum instead of old 'support@gr... | mike | 2019-03-03 | 1 | -2/+2 | |
* | | | Merge branch 'core_fixes' into 'dev' | M. Dent | 2019-03-03 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | while in legacy zot $sender is expected to be an array, in zot6 $sender is ex... | Mario Vavti | 2019-03-02 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-03-02 | 1 | -1/+1 | |
|\| | | ||||||
| * | | Mention php-zip module dependency in administrator guide | mike | 2019-03-02 | 1 | -1/+1 | |
* | | | Merge branch 'patch-20190301a' into 'dev' | Mario | 2019-03-02 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Use sender hash | DM42.Net (Matt Dent) | 2019-03-01 | 1 | -1/+1 | |
* | | | Merge branch 'js_fixes' into 'dev' | M. Dent | 2019-03-01 | 1 | -5/+11 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | iron out some kinks with scrollToItem() in combination with collapsed content... | Mario Vavti | 2019-03-01 | 1 | -5/+11 | |
|/ / | ||||||
* | | use $channel_id until the function is adapted to not need it | Mario Vavti | 2019-02-26 | 1 | -1/+1 | |
* | | Merge branch 'fix-sync_an_item' into 'dev' | Mario | 2019-02-26 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | xchan_query and fetch_post_tags uses full query results not a single row | DM42.Net (Matt Dent) | 2019-02-23 | 1 | -3/+3 | |
| * | | Fixes - sync item based on item's user | DM42.Net (Matt Dent) | 2019-02-23 | 1 | -4/+4 | |
| * | | Fix misspelled variable | DM42.Net (Matt Dent) | 2019-02-23 | 1 | -1/+1 | |
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-02-25 | 3 | -19/+88 | |
|\ \ \ | ||||||
* \ \ \ | Merge branch 'js_fixes' into 'dev' | M. Dent | 2019-02-24 | 3 | -10/+18 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | fix regression from commit 04ec35d9cc39cbf62c8db2818574c1f6d56f2a20 where sel... | Mario Vavti | 2019-02-23 | 3 | -10/+18 | |
|/ / / | ||||||
* | | | Merge branch 'php' into 'dev' | Mario | 2019-02-22 | 1 | -31/+30 | |
|\ \ \ | ||||||
| * | | | Update PHP Version check during Setup. | Klaus Weidenbach | 2019-02-21 | 1 | -31/+30 | |
* | | | | Merge branch 'es-es' into 'dev' | Max Kostikov | 2019-02-22 | 0 | -0/+0 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Merge branch 'cherry-pick-f92d2e3f' into 'es-es' | Manuel Jiménez Friaza | 2019-02-21 | 1 | -1/+1 | |
| |\ \ \ | ||||||
| | * | | | Quickfix es-es/hstrings.php | Manuel Jiménez Friaza | 2019-02-21 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | Merge branch 'cherry-pick-a9b75d05' into 'es-es' | Manuel Jiménez Friaza | 2019-02-21 | 1 | -1/+1 | |
| |\ \ \ | ||||||
| | * | | | Fix es-es/hstrings.php | Manuel Jiménez Friaza | 2019-02-21 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | Merge branch 'es-es' into 'dev' | Mario | 2019-02-21 | 2 | -1644/+1992 | |
|\| | | | ||||||
| * | | | Merge branch 'cherry-pick-e6f289de' into 'es-es' | Manuel Jiménez Friaza | 2019-02-21 | 2 | -1644/+1992 | |
| |\ \ \ | ||||||
| | * | | | Update Spanish translation | Manuel Jiménez Friaza | 2019-02-21 | 2 | -1644/+1992 | |
| |/ / / | ||||||
* | | | | Merge branch 'core_fixes' into 'dev' | M. Dent | 2019-02-21 | 2 | -2/+7 | |
|\ \ \ \ | ||||||
| * | | | | fix summary and use item_normal_search() for viewsrc so we can also view the ... | Mario Vavti | 2019-02-21 | 2 | -2/+7 | |
|/ / / / | ||||||
* | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2019-02-20 | 2 | -14066/+13995 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-02-20 | 2 | -14066/+13995 | |
| |\ \ \ \ | ||||||
| | * | | | | Update Russian hstrings.php | Max Kostikov | 2019-02-20 | 1 | -2769/+2774 | |
| | * | | | | Update Russian hmessages.po | Max Kostikov | 2019-02-20 | 1 | -11297/+11221 | |
| |/ / / / | ||||||
* | | | | | bump dev version | Mario Vavti | 2019-02-20 | 1 | -1/+1 | |
* | | | | | bump version | Mario Vavti | 2019-02-20 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge branch 'dev' into 'dev' | Mario | 2019-02-20 | 8 | -38/+295 | |
|\ \ \ \ | ||||||
| | | | * | translate name of content filter (addon) app. | zotlabs | 2019-02-28 | 1 | -0/+1 | |
| | | |/ | ||||||
| | | * | issues uncovered testing combined item/file import | zotlabs | 2019-02-24 | 3 | -5/+5 | |
| | | * | zot api changes to support combined content (items+files) import addon | zotlabs | 2019-02-24 | 2 | -19/+88 | |
| | |/ | |/| | ||||||
| * | | urlencode links in category widget | zotlabs | 2019-02-19 | 1 | -1/+1 | |
| * | | hubzilla has uuid - use that instead of wildcard | zotlabs | 2019-02-19 | 1 | -4/+4 | |
| * | | remove extraneous logging | zotlabs | 2019-02-19 | 1 | -1/+0 | |
| * | | fix ability for file storage creators (visitors) to be able to delete their o... | zotlabs | 2019-02-19 | 3 | -15/+42 | |
| * | | Merge branch 'dev' of https://framagit.org/zot/core into dev | zotlabs | 2019-02-19 | 7 | -1512/+1811 | |
| |\ \ | |/ / |/| | | ||||||
* | | | 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. | M.Dent | 2019-02-18 | 1 | -0/+2 | |
* | | | | Merge branch 'js_fixes' into 'dev' | M. Dent | 2019-02-19 | 1 | -2/+2 | |
|\ \ \ \ |