aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * 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
| |/ /
| | * 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
| * | | fetch private objects using delivery channel credentialszotlabs2019-03-081-5/+28
| * | | update changelogMario Vavti2019-03-071-0/+1
| * | | guest access tokens: xchan record not created on URL loginzotlabs2019-03-071-0/+1
| * | | changelogMario Vavti2019-03-061-0/+104
| * | | bump versionMario Vavti2019-03-061-1/+1
| * | | while in legacy zot $sender is expected to be an array, in zot6 $sender is ex...Mario Vavti2019-03-061-1/+1
| * | | Add CURLOPT_CONNECTTIMEOUTM. Dent2019-03-061-0/+7
| * | | channel_type is not integerzotlabs2019-03-061-5/+17
| * | | maintain compatibility with recent zot6 changeszotlabs2019-03-061-0/+6
| * | | api_router - allow parameters as final path argumentzotlabs2019-03-051-1/+9
| * | | remove clones from delivery recipients for top-level posts - they will get th...zotlabs2019-03-051-0/+6
| * | | mod_oep: photos/album/xxxxx is no longer hex2bin/bin2hex but the album hash a...zotlabs2019-03-051-1/+1
| * | | translate name of content filter (addon) app.zotlabs2019-03-051-0/+1
| * | | Addressing new 'support@zotadel.net' support forum instead of old 'support@gr...mike2019-03-041-2/+2
| * | | Mention php-zip module dependency in administrator guidemike2019-03-021-1/+1
| * | | Use sender hashDM42.Net (Matt Dent)2019-03-021-1/+1