| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 and images See merge request hubzilla/core!1534 | ||||
| | * | iron out some kinks with scrollToItem() in combination with collapsed ↵ | Mario Vavti | 2019-03-01 | 1 | -5/+11 |
| |/ | | | | content and images | ||||
| * | 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 |
| |\ | | | | | | | | | Fix sync an item See merge request hubzilla/core!1531 | ||||
| | * | 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 |
| |\ \ | | | | | | | | | | | | | zot api changes to support combined content (items+files) import addon See merge request hubzilla/core!1533 | ||||
| | * | | 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 |
| | | | | |||||
| * | | | Merge branch 'js_fixes' into 'dev' | M. Dent | 2019-02-24 | 3 | -10/+18 |
| |\ \ \ | |_|/ |/| | | | | | | | | fix regression from commit 04ec35d9cc39cbf62c8db2818574c1f6d56f2a20 where... See merge request hubzilla/core!1532 | ||||
| | * | | fix regression from commit 04ec35d9cc39cbf62c8db2818574c1f6d56f2a20 where ↵ | Mario Vavti | 2019-02-23 | 3 | -10/+18 |
| |/ / | | | | | | | selecting multiple images from embed photos dialog broke and fix issue where items were not scrolled to there correct position if justifiedGalleryActive flag was true | ||||
| * | | Merge branch 'php' into 'dev' | Mario | 2019-02-22 | 1 | -31/+30 |
| |\ \ | | | | | | | | | | | | | Update PHP Version check during Setup. See merge request hubzilla/core!1530 | ||||
| | * | | Update PHP Version check during Setup. | Klaus Weidenbach | 2019-02-21 | 1 | -31/+30 |
| | | | | | | | | | | | | | | | | Hubzilla 4.0 requires PHP7. The oldest still supported PHP branch is 7.1. So check during Setup for PHP >= 7.1. | ||||
| * | | | Merge branch 'es-es' into 'dev' | Max Kostikov | 2019-02-22 | 0 | -0/+0 |
| |\ \ \ | |/ / |/| | | | | | | | | Quickfix es-es/hstrings.php See merge request hubzilla/core!1529 | ||||
| | * | | Merge branch 'cherry-pick-f92d2e3f' into 'es-es' | Manuel Jiménez Friaza | 2019-02-21 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | Quickfix es-es/hstrings.php See merge request mjfriaza/core!6 | ||||
| | | * | | Quickfix es-es/hstrings.php | Manuel Jiménez Friaza | 2019-02-21 | 1 | -1/+1 |
| | |/ / | | | | | | | (cherry picked from commit f92d2e3f7c6573bd7bab04223c7e28662605c6d8) | ||||
| | * | | Merge branch 'cherry-pick-a9b75d05' into 'es-es' | Manuel Jiménez Friaza | 2019-02-21 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | Fix es-es/hstrings.php See merge request mjfriaza/core!5 | ||||
| | | * | | Fix es-es/hstrings.php | Manuel Jiménez Friaza | 2019-02-21 | 1 | -1/+1 |
| | |/ / | | | | | | | (cherry picked from commit a9b75d059b2a54f1b87657d95f9ac1124ed4287d) | ||||
| * | | | 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 | ||||
| | * | | 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. | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |