| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | Merge branch 'es-es' into 'dev' | Mario | 2019-02-21 | 2 | -1644/+1992 | |
| | |\| | | | | | | | | | | | | | | | | | | Update es-es See merge request hubzilla/core!1526 | |||||
| | | * | | Merge branch 'cherry-pick-e6f289de' into 'es-es' | Manuel Jiménez Friaza | 2019-02-21 | 2 | -1644/+1992 | |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | Update Spanish translation See merge request mjfriaza/core!4 | |||||
| | | | * | | Update Spanish translation | Manuel Jiménez Friaza | 2019-02-21 | 2 | -1644/+1992 | |
| | | |/ / | | | | | | | | | (cherry picked from commit e6f289deb65e7c770641b27bbe0e48d056a6cd76) | |||||
| | * | | | 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... See merge request hubzilla/core!1525 | |||||
| | | * | | | fix summary and use item_normal_search() for viewsrc so we can also view the ↵ | Mario Vavti | 2019-02-21 | 2 | -2/+7 | |
| | |/ / / | | | | | | | | | | | | | source for articles, cards, etc. | |||||
| | * | | | 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 translation See merge request hubzilla/core!1524 | |||||
| | | | * | | | 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 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | basic support for nomadic content, fix for permitted guests deleting their own files in cloud space of other channel,urlencode category widget links See merge request hubzilla/core!1523 | |||||
| * | | | | | 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 ↵ | zotlabs | 2019-02-19 | 3 | -15/+42 | |
| | | | | | | | | | | | | | own content | |||||
| * | | | 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. See merge request hubzilla/core!1521 | |||||
| | | * | | 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 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | prevent page jumping on like if comments are expanded (show all x comments) See merge request hubzilla/core!1520 | |||||
| | | * | | | prevent page jumping on like if comments are expanded (show all x comments) | Mario Vavti | 2019-02-18 | 1 | -2/+2 | |
| | | |/ / | ||||||
| | * | | | Merge branch 'mod_display_fixes' into 'dev' | M. Dent | 2019-02-19 | 1 | -3/+2 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | if local_channel() and updating the page do not query for another item if the... See merge request hubzilla/core!1519 | |||||
| | | * | | | if local_channel() and updating the page do not query for another item if ↵ | Mario Vavti | 2019-02-18 | 1 | -3/+2 | |
| | | |/ / | | | | | | | | | | | | | the first query returned no results. we will most probably find an item from another channel (e.g. after liking a comment) and end up with multiple items with the same mid from different channels after the page update | |||||
| | * | | | Merge branch 'core_fixes' into 'dev' | M. Dent | 2019-02-19 | 1 | -1/+0 | |
| | |\ \ \ | | |/ / | |/| | | | | | | | | | | remove zottel.net from fallback servers. it switched to directory_mode_normal from secondary See merge request hubzilla/core!1518 | |||||
| | | * | | remove zottel.net from fallback servers. it switched to ↵ | Mario Vavti | 2019-02-18 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | directory_mode_normal from secondary | |||||
| * | | | | mod_id should return object not collection | zotlabs | 2019-02-19 | 1 | -76/+9 | |
| | | | | | ||||||
| * | | | | support zot location independent urls | zotlabs | 2019-02-18 | 4 | -22/+320 | |
| |/ / / | ||||||
| * | | | Merge branch 'photo_driver_refactor' into 'dev' | Mario | 2019-02-18 | 7 | -877/+1145 | |
| |\ \ \ | | | | | | | | | | | | | | | | | Photo driver refactor See merge request hubzilla/core!1515 | |||||
| | * | | | Remove duplicate code in PhotoDriver classes. | Klaus Weidenbach | 2019-02-14 | 3 | -38/+32 | |
| | | | | | | | | | | | | | | | | | | | | | cropImage is just a special case of cropImageRect, no need to duplicate all the code. | |||||
| | * | | | Refactor photo_driver to use namespaces. | Klaus Weidenbach | 2019-02-14 | 7 | -684/+929 | |
| | | | | | | | | | | | | | | | | | Add simple UnitTest, but it is not yet very meaningful. | |||||
| | * | | | 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. See merge request hubzilla/core!1516 | |||||
| | * | | | | Improve gitlab-ci environment. | Klaus Weidenbach | 2019-02-17 | 1 | -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' | Mario | 2019-02-18 | 1 | -1/+1 | |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | MySQL 8 admin summary compatibility See merge request hubzilla/core!1517 | |||||
| | * | | | 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 See merge request hubzilla/core!1513 | |||||
| | * | | | | 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 | |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | Remove deprecated addon settings See merge request hubzilla/core!1514 | |||||
| | * | | | | 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 See merge request hubzilla/core!1511 | |||||
| | * | | | | 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 See merge request hubzilla/core!1512 | |||||
| | * | | | | 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 See merge request hubzilla/core!1449 | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |