aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-03-082-13/+10
|\
| * update changelogMario Vavti2019-03-081-1/+1
| * Merge branch 'core_fixes_1' into 'dev'M. Dent2019-03-081-12/+9
| |\
| | * $sender is supposed to be string in libzotMario2019-03-081-12/+9
| |/
| * Merge branch 'dev' into 'dev'M. Dent2019-03-081-5/+28
| |\
* | | port zot_record_preferredzotlabs2019-03-081-2/+22
* | | It is in fact the 'Content Import' app string that needs to be translated. A ...zotlabs2019-03-071-0/+1
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-03-072-0/+112
|\| | | |/ |/|
| * update changelogMario Vavti2019-03-071-0/+1
| * Merge branch 'dev' into 'dev'Mario2019-03-071-0/+1
| |\
| * | changelogMario Vavti2019-03-061-0/+104
| * | Merge branch 'patch-20190305a' into 'dev'Mario2019-03-061-0/+7
| |\ \
| | * | Add CURLOPT_CONNECTTIMEOUTM. Dent2019-03-061-0/+7
| |/ /
| * | Merge branch 'dev' into 'dev'Mario2019-03-061-0/+18
| |\ \
| * \ \ Merge branch 'dev' into 'dev'Mario2019-03-054-2/+17
| |\ \ \
* | | | | fetch private objects using delivery channel credentialszotlabs2019-03-071-5/+28
| |_|_|/ |/| | |
* | | | guest access tokens: xchan record not created on URL loginzotlabs2019-03-061-0/+1
| |_|/ |/| |
* | | channel_type is not integerzotlabs2019-03-051-5/+17
* | | maintain compatibility with recent zot6 changeszotlabs2019-03-051-0/+6
| |/ |/|
* | api_router - allow parameters as final path argumentzotlabs2019-03-041-1/+9
* | remove clones from delivery recipients for top-level posts - they will get th...zotlabs2019-03-041-0/+6
* | mod_oep: photos/album/xxxxx is no longer hex2bin/bin2hex but the album hash a...zotlabs2019-03-041-1/+1
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-03-0416-15761/+16056
|\|
| * 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
| |\ \
| * \ \ 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
| | |\ \