aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge branch 'patch-20190305a' into 'dev'Mario2019-03-061-0/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add CURLOPT_CONNECTTIMEOUT See merge request hubzilla/core!1542
| | * | | | Add CURLOPT_CONNECTTIMEOUTM. Dent2019-03-061-0/+7
| |/ / / /
| * | | | Merge branch 'dev' into 'dev'Mario2019-03-061-0/+18
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | sync recent z6 protocol change See merge request hubzilla/core!1541
| * \ \ \ \ Merge branch 'dev' into 'dev'Mario2019-03-054-2/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | assorted minor fixes from downstream See merge request hubzilla/core!1540
| | | | | * | 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 ↵zotlabs2019-03-041-0/+6
| | | | | | | | | | | | | | | | the post via clone sync
| | * | mod_oep: photos/album/xxxxx is no longer hex2bin/bin2hex but the album hash ↵zotlabs2019-03-041-1/+1
| | | | | | | | | | | | | | | | and is throwing php warnings when trying to decode
| | * | 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@gravizot.de' See merge request hubzilla/core!1539
| | * | | Addressing new 'support@zotadel.net' support forum instead of old ↵mike2019-03-031-2/+2
| | | | | | | | | | | | | | | | | | | | 'support@gravizot.de'
| * | | | 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... See merge request hubzilla/core!1538
| | * | | | while in legacy zot $sender is expected to be an array, in zot6 $sender is ↵Mario Vavti2019-03-021-1/+1
| |/ / / / | | | | | | | | | | | | | | | expected to be a string (xchan_hash)
| * | | | Merge branch 'dev' into 'dev'Mario2019-03-021-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | Mention php-zip module dependency in administrator guide See merge request hubzilla/core!1537
| | * | | 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 hash See merge request hubzilla/core!1535
| | * | | 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 and images See merge request hubzilla/core!1534
| | * | | iron out some kinks with scrollToItem() in combination with collapsed ↵Mario Vavti2019-03-011-5/+11
| |/ / / | | | | | | | | | | | | content and images
| | * | translate name of content filter (addon) app.zotlabs2019-02-281-0/+1
| | | |
* | | | merge text.php and hmessages.po4.0Mario Vavti2019-03-082-23/+1
| | | |
* | | | Merge branch '4.0RC'Mario Vavti2019-03-08172-19665/+24100
|\ \ \ \
| * | | | update changelogMario Vavti2019-03-081-1/+1
| | | | |
| * | | | bump versionMario Vavti2019-03-081-1/+1
| | | | |
| * | | | $sender is supposed to be string in libzotMario2019-03-081-12/+9
| | | | | | | | | | | | | | | (cherry picked from commit 507c71f64c68cc0de0f090f1abdd024866e91068)
| * | | | fetch private objects using delivery channel credentialszotlabs2019-03-081-5/+28
| | | | | | | | | | | | | | | (cherry picked from commit 1f7622e4c42bf71d1d38dd88c40c903d83a8d6c0)
| * | | | update changelogMario Vavti2019-03-071-0/+1
| | | | | | | | | | | | | | | (cherry picked from commit 04fe7e61deb19b9b05c87bff037b7bbf1d7bc662)
| * | | | guest access tokens: xchan record not created on URL loginzotlabs2019-03-071-0/+1
| | | | | | | | | | | | | | | (cherry picked from commit 0b2213dd41a7ef275766725c070e16f8ba94d5a5)
| * | | | changelogMario Vavti2019-03-061-0/+104
| | | | | | | | | | | | | | | (cherry picked from commit 08725c44c6874bdbbb46649645a9ac818f0abe36)
| * | | | bump versionMario Vavti2019-03-061-1/+1
| | | | |
| * | | | while in legacy zot $sender is expected to be an array, in zot6 $sender is ↵Mario Vavti2019-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | expected to be a string (xchan_hash) (cherry picked from commit 117a8cafca6982e7d976fe00f32ecb0df66b2899)
| * | | | Add CURLOPT_CONNECTTIMEOUTM. Dent2019-03-061-0/+7
| | | | | | | | | | | | | | | (cherry picked from commit 0c05e6593e020180ca678dff6d60c095e23b34cd)
| * | | | channel_type is not integerzotlabs2019-03-061-5/+17
| | | | | | | | | | | | | | | (cherry picked from commit 26e7da0b969c834cc6c2ff7c00713c7be05cb5c4)
| * | | | maintain compatibility with recent zot6 changeszotlabs2019-03-061-0/+6
| | | | | | | | | | | | | | | (cherry picked from commit 98b1c7a38c3f3ef8ba7d36b77d9366691c3fbf15)
| * | | | api_router - allow parameters as final path argumentzotlabs2019-03-051-1/+9
| | | | | | | | | | | | | | | (cherry picked from commit 47001c33039e6915f12b95a3e948caae6cf21d41)
| * | | | remove clones from delivery recipients for top-level posts - they will get ↵zotlabs2019-03-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | the post via clone sync (cherry picked from commit 8e50fecccca5dd72a49869502e541db03632cd86)
| * | | | mod_oep: photos/album/xxxxx is no longer hex2bin/bin2hex but the album hash ↵zotlabs2019-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | and is throwing php warnings when trying to decode (cherry picked from commit 938fcdd1a6e8db47d2e66d68f8face9925bb7963)
| * | | | translate name of content filter (addon) app.zotlabs2019-03-051-0/+1
| | | | | | | | | | | | | | | (cherry picked from commit 29cb62af3dba0a6a2891800cfe97578c1a2819ae)
| * | | | Addressing new 'support@zotadel.net' support forum instead of old ↵mike2019-03-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | 'support@gravizot.de' (cherry picked from commit e26de9c1d11dc8175ea520be091f0437d99ea5e0)
| * | | | 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
| | | | | |