aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Cleanup and fixesMario2019-03-1511-74/+55
|
* Merge branch 'dev' into 'dev'Mario2019-03-144-2/+40
|\ | | | | | | | | two compatibility issues zot/zot6 See merge request hubzilla/core!1553
| * Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into devMike Macgirvin2019-03-141-2/+2
| |\
| | * Merge branch 'dev' of ../hz into devzotlabs2019-03-131-2/+2
| | |\
| | | * signature issue for zot6 content imported from zotfeeds to hubzillazotlabs2019-03-131-2/+2
| | | |
| * | | 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
| | |/ | | | | | | | | | since z6 is not the default protocol on hubzilla). This will need to be pushed to master for the next point release.
* | | Merge branch 'core_fixes_2' into 'dev'M. Dent2019-03-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | add zot6 to clonable networks See merge request hubzilla/core!1552
| * | | add zot6 to clonable networksMario Vavti2019-03-131-1/+1
|/ / /
* | | Merge branch 'dev' into 'dev'Mario2019-03-133-88/+239
|\| | | | | | | | | | | | | | Dev See merge request hubzilla/core!1551
| * | 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
|\ \ | | | | | | | | | | | | perform zot6 discovery in import_author_xchan See merge request hubzilla/core!1550
* \ \ Merge branch 'dev' into 'dev'Mario2019-03-111-7/+23
|\ \ \ | | | | | | | | | | | | | | | | init_groups_visitor: include xchans from all zot-like networks See merge request hubzilla/core!1549
| | | * 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 ↵zotlabs2019-03-121-56/+41
| | | | | | | | | | | | | | | | requested item)
| | | * 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 ↵zotlabs2019-03-101-13/+11
| | | | | | | | identities
| * 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
|\ \ | | | | | | | | | | | | non-critical: port zot_record_preferred() See merge request hubzilla/core!1546
| | * 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
| | | | | | (cherry picked from commit 5b3824917d591b27c4797971c8253ed67b41dc5a)
* | Merge branch 'core_fixes_1' into 'dev'M. Dent2019-03-081-12/+9
|\ \ | | | | | | | | | | | | $sender is supposed to be string in libzot See merge request hubzilla/core!1544
| * | $sender is supposed to be string in libzotMario2019-03-081-12/+9
|/ /
* | Merge branch 'dev' into 'dev'M. Dent2019-03-081-5/+28
|\ \ | | | | | | | | | | | | fetch private objects using delivery channel credentials See merge request hubzilla/core!1545
| | * 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
| | | | | | | | | | | | previous commit errantly included the string 'Content Filter'. But don't remove 'Content Filter'. That is actually a thing in Zap and will eventually make its way to Hubzilla.
| | * 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
|\ \ | | | | | | | | | | | | guest access tokens: xchan record not created on URL login See merge request hubzilla/core!1543
* | | changelogMario Vavti2019-03-061-0/+104
| | |
* | | 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
| |\ | |/ |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 12:53:21 +0000