aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into devMike Macgirvin2019-03-143-0/+38
|\
| * find unregistered z6 clones on hubzilla sites (does not happen automatically ...zotlabs2019-03-133-0/+38
* | limit 1Mike Macgirvin2019-03-131-1/+1
|/
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMike Macgirvin2019-03-130-0/+0
|\
| * Merge branch 'dev' into 'dev'Mario2019-03-121-0/+9
| |\
| * \ Merge branch 'dev' into 'dev'Mario2019-03-111-7/+23
| |\ \
* | \ \ Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into devMike Macgirvin2019-03-133-88/+239
|\ \ \ \ | |_|_|/ |/| | |
| * | | rework authenticated item fetches (check ACL on the parent, not on the reques...zotlabs2019-03-121-56/+41
| * | | add owner permission checks to AS item fetchzotlabs2019-03-121-2/+37
| * | | typoszotlabs2019-03-121-8/+8
| * | | Merge branch 'dev' of ../hz into devzotlabs2019-03-111-0/+9
| |\ \ \
| | * | | check zot6 in import_author_xchanzotlabs2019-03-111-0/+9
| | | |/ | | |/|
| * / | security updates for multiple xchanszotlabs2019-03-111-59/+189
| |/ /
* / / perform zot6 discovery in import_author_xchanMike Macgirvin2019-03-121-0/+9
|/ /
* | testing init_groups_visitor changes - also add virtual groups for both zot id...zotlabs2019-03-101-13/+11
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-03-100-0/+0
|\|
| * Merge branch 'dev' into 'dev'Mario2019-03-105-3/+76
| |\
* | | init_groups_visitor: include xchans from all zot-like networkszotlabs2019-03-101-3/+21
| |/ |/|
* | authenticated fetch fixeszotlabs2019-03-093-1/+53
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-18 10:09:18 +0000