Mike Macgirvin
|
f4d7338687
|
Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev
|
2019-03-14 10:34:22 +11:00 |
|
zotlabs
|
6a8c3f82ef
|
Merge branch 'dev' of ../hz into dev
|
2019-03-13 16:32:27 -07:00 |
|
zotlabs
|
05bcbfa28c
|
signature issue for zot6 content imported from zotfeeds to hubzilla
|
2019-03-13 16:31:37 -07:00 |
|
Mike Macgirvin
|
6a55500c1b
|
Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev
|
2019-03-14 10:30:01 +11:00 |
|
zotlabs
|
a5a5ac60ba
|
find unregistered z6 clones on hubzilla sites (does not happen automatically since z6 is not the default protocol on hubzilla). This will need to be pushed to master for the next point release.
|
2019-03-13 16:27:52 -07:00 |
|
Mike Macgirvin
|
088a93e023
|
limit 1
|
2019-03-13 13:21:04 +11:00 |
|
Mike Macgirvin
|
30f71ad632
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-03-13 10:42:25 +11:00 |
|
Mike Macgirvin
|
0026849821
|
Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev
|
2019-03-13 10:40:23 +11:00 |
|
zotlabs
|
cf5a310286
|
rework authenticated item fetches (check ACL on the parent, not on the requested item)
|
2019-03-12 16:17:34 -07:00 |
|
zotlabs
|
72384ff2cb
|
add owner permission checks to AS item fetch
|
2019-03-12 15:17:25 -07:00 |
|
Mario
|
c33ef01af8
|
Merge branch 'dev' into 'dev'
perform zot6 discovery in import_author_xchan
See merge request hubzilla/core!1550
|
2019-03-12 13:40:04 +01:00 |
|
zotlabs
|
11116bdcb7
|
typos
|
2019-03-12 03:40:43 -07:00 |
|
zotlabs
|
09a5cf4e68
|
Merge branch 'dev' of ../hz into dev
|
2019-03-11 22:24:13 -07:00 |
|
zotlabs
|
a9172129d2
|
check zot6 in import_author_xchan
|
2019-03-11 22:17:36 -07:00 |
|
Mike Macgirvin
|
3ec06705ca
|
perform zot6 discovery in import_author_xchan
|
2019-03-12 16:12:29 +11:00 |
|
zotlabs
|
5fb0d38ad8
|
security updates for multiple xchans
|
2019-03-11 16:29:12 -07:00 |
|
Mario
|
9ed5cddb89
|
Merge branch 'dev' into 'dev'
init_groups_visitor: include xchans from all zot-like networks
See merge request hubzilla/core!1549
|
2019-03-11 09:38:27 +01:00 |
|
zotlabs
|
4e97fb0e58
|
testing init_groups_visitor changes - also add virtual groups for both zot identities
|
2019-03-10 22:32:37 -07:00 |
|
zotlabs
|
1688e373bc
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-03-10 15:52:07 -07:00 |
|
zotlabs
|
cada0b6df1
|
init_groups_visitor: include xchans from all zot-like networks
|
2019-03-10 15:50:45 -07:00 |
|
Mario
|
91358010a0
|
Merge branch 'dev' into 'dev'
non-critical: port zot_record_preferred()
See merge request hubzilla/core!1546
|
2019-03-10 11:40:33 +01:00 |
|
zotlabs
|
51024d3821
|
authenticated fetch fixes
|
2019-03-09 12:58:03 -08:00 |
|
zotlabs
|
220d6ed494
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-03-08 14:56:13 -08:00 |
|
zotlabs
|
b5ed3edc8f
|
port zot_record_preferred
|
2019-03-08 14:51:30 -08:00 |
|
Mario Vavti
|
73c96f35c1
|
update changelog
(cherry picked from commit 5b3824917d)
|
2019-03-08 11:48:52 +01:00 |
|
M. Dent
|
b8d79d9132
|
Merge branch 'core_fixes_1' into 'dev'
$sender is supposed to be string in libzot
See merge request hubzilla/core!1544
|
2019-03-08 05:45:02 +01:00 |
|
Mario
|
507c71f64c
|
$sender is supposed to be string in libzot
|
2019-03-08 05:45:02 +01:00 |
|
zotlabs
|
ce0067d8eb
|
It is in fact the 'Content Import' app string that needs to be translated. A 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.
|
2019-03-07 20:01:41 -08:00 |
|
M. Dent
|
c0b238b19a
|
Merge branch 'dev' into 'dev'
fetch private objects using delivery channel credentials
See merge request hubzilla/core!1545
|
2019-03-08 02:48:03 +01:00 |
|
zotlabs
|
d961cf21fb
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-03-07 16:05:15 -08:00 |
|
zotlabs
|
1f7622e4c4
|
fetch private objects using delivery channel credentials
|
2019-03-07 15:45:42 -08:00 |
|
Mario Vavti
|
04fe7e61de
|
update changelog
|
2019-03-07 09:32:12 +01:00 |
|
Mario
|
3e6607585f
|
Merge branch 'dev' into 'dev'
guest access tokens: xchan record not created on URL login
See merge request hubzilla/core!1543
|
2019-03-07 09:29:21 +01:00 |
|
zotlabs
|
0b2213dd41
|
guest access tokens: xchan record not created on URL login
|
2019-03-06 19:01:28 -08:00 |
|
Mario Vavti
|
08725c44c6
|
changelog
|
2019-03-06 21:08:56 +01:00 |
|
Mario
|
75a66b716e
|
Merge branch 'patch-20190305a' into 'dev'
Add CURLOPT_CONNECTTIMEOUT
See merge request hubzilla/core!1542
|
2019-03-06 09:52:26 +01:00 |
|
M. Dent
|
0c05e6593e
|
Add CURLOPT_CONNECTTIMEOUT
|
2019-03-06 09:52:26 +01:00 |
|
Mario
|
c43ab50d66
|
Merge branch 'dev' into 'dev'
sync recent z6 protocol change
See merge request hubzilla/core!1541
|
2019-03-06 09:47:40 +01:00 |
|
zotlabs
|
26e7da0b96
|
channel_type is not integer
|
2019-03-05 17:06:42 -08:00 |
|
zotlabs
|
98b1c7a38c
|
maintain compatibility with recent zot6 changes
|
2019-03-05 16:57:32 -08:00 |
|
Mario
|
ccdbec619c
|
Merge branch 'dev' into 'dev'
assorted minor fixes from downstream
See merge request hubzilla/core!1540
|
2019-03-05 09:40:45 +01:00 |
|
zotlabs
|
47001c3303
|
api_router - allow parameters as final path argument
|
2019-03-04 20:11:43 -08:00 |
|
zotlabs
|
8e50fecccc
|
remove clones from delivery recipients for top-level posts - they will get the post via clone sync
|
2019-03-04 20:09:47 -08:00 |
|
zotlabs
|
938fcdd1a6
|
mod_oep: photos/album/xxxxx is no longer hex2bin/bin2hex but the album hash and is throwing php warnings when trying to decode
|
2019-03-04 20:07:01 -08:00 |
|
zotlabs
|
9ede57b228
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-03-04 14:50:33 -08:00 |
|
Mario
|
e074d02714
|
Merge branch 'dev' into 'dev'
Addressing new 'support@zotadel.net' support forum instead of old 'support@gravizot.de'
See merge request hubzilla/core!1539
|
2019-03-04 09:50:12 +01:00 |
|
mike
|
e26de9c1d1
|
Addressing new 'support@zotadel.net' support forum instead of old 'support@gravizot.de'
|
2019-03-03 18:24:36 +03:00 |
|
M. Dent
|
7dc3835a54
|
Merge branch 'core_fixes' into 'dev'
while in legacy zot $sender is expected to be an array, in zot6 $sender is...
See merge request hubzilla/core!1538
|
2019-03-03 03:37:33 +01:00 |
|
Mario Vavti
|
117a8cafca
|
while in legacy zot $sender is expected to be an array, in zot6 $sender is expected to be a string (xchan_hash)
|
2019-03-02 15:50:53 +01:00 |
|
Mario
|
8a0a0aef5c
|
Merge branch 'dev' into 'dev'
Mention php-zip module dependency in administrator guide
See merge request hubzilla/core!1537
|
2019-03-02 15:01:50 +01:00 |
|