aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Mention php-zip module dependency in administrator guidemike2019-03-021-1/+1
| | | (cherry picked from commit 747ce9b1f15d3f656ed8ca816c1790c351decec9)
* Use sender hashDM42.Net (Matt Dent)2019-03-021-1/+1
| | | (cherry picked from commit 5febc3e07dd1c1aeda68c09b4092d5d4219f39b5)
* iron out some kinks with scrollToItem() in combination with collapsed ↵Mario Vavti2019-03-021-5/+11
| | | | | content and images (cherry picked from commit 2244bf2ba2e8611017de51fbeb3c449efef906f0)
* versionMario Vavti2019-02-261-1/+1
|
* Merge branch 'dev' into 4.0RCMario Vavti2019-02-261-1/+1
|\
| * 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
| |\ | | | | | | | | | | | | Fix sync an item See merge request hubzilla/core!1531
| | * 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 4.0RCMario Vavti2019-02-267-30/+107
|\| |
| * | Merge branch 'dev' into 'dev'Mario2019-02-253-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 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... See merge request hubzilla/core!1532
| | * | fix regression from commit 04ec35d9cc39cbf62c8db2818574c1f6d56f2a20 where ↵Mario Vavti2019-02-233-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'Mario2019-02-221-31/+30
| |\ \ | | | | | | | | | | | | | | | | Update PHP Version check during Setup. See merge request hubzilla/core!1530
| | * | Update PHP Version check during Setup.Klaus Weidenbach2019-02-211-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 Kostikov2019-02-220-0/+0
| |\ \ \ | | |/ / | |/| | | | | | | | | | Quickfix es-es/hstrings.php See merge request hubzilla/core!1529
| | * | Merge branch 'cherry-pick-f92d2e3f' into 'es-es'Manuel Jiménez Friaza2019-02-211-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | Quickfix es-es/hstrings.php See merge request mjfriaza/core!6
| | | * | Quickfix es-es/hstrings.phpManuel Jiménez Friaza2019-02-211-1/+1
| | |/ / | | | | | | | | (cherry picked from commit f92d2e3f7c6573bd7bab04223c7e28662605c6d8)
| | * | Merge branch 'cherry-pick-a9b75d05' into 'es-es'Manuel Jiménez Friaza2019-02-211-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | Fix es-es/hstrings.php See merge request mjfriaza/core!5
| | | * | Fix es-es/hstrings.phpManuel Jiménez Friaza2019-02-211-1/+1
| | |/ / | | | | | | | | (cherry picked from commit a9b75d059b2a54f1b87657d95f9ac1124ed4287d)
| * | | Merge branch 'es-es' into 'dev'Mario2019-02-212-1644/+1992
| |\| | | | | | | | | | | | | | | | | | Update es-es See merge request hubzilla/core!1526
| | * | Merge branch 'cherry-pick-e6f289de' into 'es-es'Manuel Jiménez Friaza2019-02-212-1644/+1992
| | |\ \ | | | | | | | | | | | | | | | | | | | | Update Spanish translation See merge request mjfriaza/core!4
| | | * | Update Spanish translationManuel Jiménez Friaza2019-02-212-1644/+1992
| | |/ / | | | | | | | | (cherry picked from commit e6f289deb65e7c770641b27bbe0e48d056a6cd76)
| * | | 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... See merge request hubzilla/core!1525
| | * | | fix summary and use item_normal_search() for viewsrc so we can also view the ↵Mario Vavti2019-02-212-2/+7
| |/ / / | | | | | | | | | | | | source for articles, cards, etc.
| * | | 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 translation See merge request hubzilla/core!1524
| | | * | | 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
| | | | |
* | | | | Update PHP Version check during Setup.Klaus Weidenbach2019-02-221-31/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hubzilla 4.0 requires PHP7. The oldest still supported PHP branch is 7.1. So check during Setup for PHP >= 7.1. (cherry picked from commit 3f13c85b64ebaa4fbd2ee6c0276febcdc3bf7afb)
* | | | | Update Spanish translationManuel Jiménez Friaza2019-02-212-1644/+1992
| | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit e6f289deb65e7c770641b27bbe0e48d056a6cd76) (cherry picked from commit a3a90ea09b0a3288a4b55c4078751eff0b3f801b)
* | | | | fix summary and use item_normal_search() for viewsrc so we can also view the ↵Mario Vavti2019-02-212-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | source for articles, cards, etc. (cherry picked from commit a0ad110cff00bc9c506f5e6b921e5bd350f98f98)
* | | | | Update Russian hstrings.phpMax Kostikov2019-02-201-2769/+2774
| | | | | | | | | | | | | | | (cherry picked from commit 3a6ea57d2cd80a0aaac04cc495a4a7d0395ab07e)
* | | | | Update Russian hmessages.poMax Kostikov2019-02-201-11297/+11221
|/ / / / | | | | | | | | (cherry picked from commit e960bcfd1c2f0deed6818ee71e1139684e1832ab)
* / / / bump versionMario Vavti2019-02-201-1/+1
|/ / /
* | | Merge branch 'dev' into 'dev'Mario2019-02-208-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 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 ↵zotlabs2019-02-193-15/+42
| | | | | | | | | | | | own content
| * | 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. See merge request hubzilla/core!1521
| * | | 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) See merge request hubzilla/core!1520