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 |
|
harukin
|
8f594ad6d9
|
Merge branch 'origin' into 'japanese'
marge from origin 4.0
See merge request harukin/core!41
|
2019-03-09 17:58:02 +09:00 |
|
harukin
|
19e1325604
|
edit translation
|
2019-03-09 17:36:26 +09: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
|
9772726065
|
merge text.php and hmessages.po
|
2019-03-08 12:32:20 +01:00 |
|
Mario Vavti
|
8ecdde6cb5
|
Merge branch '4.0RC'
|
2019-03-08 11:52:57 +01:00 |
|
Mario Vavti
|
73c96f35c1
|
update changelog
(cherry picked from commit 5b3824917d)
|
2019-03-08 11:48:52 +01:00 |
|
Mario Vavti
|
5b3824917d
|
update changelog
|
2019-03-08 11:48:01 +01:00 |
|
Mario Vavti
|
ca4f10dc5e
|
bump version
|
2019-03-08 11:46:36 +01:00 |
|
Mario
|
853fb33913
|
$sender is supposed to be string in libzot
(cherry picked from commit 507c71f64c)
|
2019-03-08 09:45:15 +01:00 |
|
zotlabs
|
e352cfc861
|
fetch private objects using delivery channel credentials
(cherry picked from commit 1f7622e4c4)
|
2019-03-08 09:35:04 +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
|
b019ca0746
|
update changelog
(cherry picked from commit 04fe7e61de)
|
2019-03-07 09:32:39 +01:00 |
|
Mario Vavti
|
04fe7e61de
|
update changelog
|
2019-03-07 09:32:12 +01:00 |
|
zotlabs
|
beb4e00afb
|
guest access tokens: xchan record not created on URL login
(cherry picked from commit 0b2213dd41)
|
2019-03-07 09:30:38 +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
|
9450305568
|
changelog
(cherry picked from commit 08725c44c6)
|
2019-03-06 21:10:51 +01:00 |
|
Mario Vavti
|
08725c44c6
|
changelog
|
2019-03-06 21:08:56 +01:00 |
|
Mario Vavti
|
e18c64c9d9
|
bump version
|
2019-03-06 10:02:33 +01:00 |
|
Mario Vavti
|
7b018c60cb
|
while in legacy zot $sender is expected to be an array, in zot6 $sender is expected to be a string (xchan_hash)
(cherry picked from commit 117a8cafca)
|
2019-03-06 09:58:11 +01:00 |
|
M. Dent
|
a81286c795
|
Add CURLOPT_CONNECTTIMEOUT
(cherry picked from commit 0c05e6593e)
|
2019-03-06 09:56:01 +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 |
|
zotlabs
|
571e9bf26a
|
channel_type is not integer
(cherry picked from commit 26e7da0b96)
|
2019-03-06 09:49:40 +01:00 |
|
zotlabs
|
c4714e95b6
|
maintain compatibility with recent zot6 changes
(cherry picked from commit 98b1c7a38c)
|
2019-03-06 09:49:18 +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 |
|
harukin
|
0d283b2666
|
edit translation
|
2019-03-06 10:32:47 +09: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 |
|
zotlabs
|
d407e5556e
|
api_router - allow parameters as final path argument
(cherry picked from commit 47001c3303)
|
2019-03-05 09:44:36 +01:00 |
|
zotlabs
|
6a3cfe54af
|
remove clones from delivery recipients for top-level posts - they will get the post via clone sync
(cherry picked from commit 8e50fecccc)
|
2019-03-05 09:43:51 +01:00 |
|
zotlabs
|
a0bffe4a78
|
mod_oep: photos/album/xxxxx is no longer hex2bin/bin2hex but the album hash and is throwing php warnings when trying to decode
(cherry picked from commit 938fcdd1a6)
|
2019-03-05 09:43:29 +01:00 |
|
zotlabs
|
336c716a44
|
translate name of content filter (addon) app.
(cherry picked from commit 29cb62af3d)
|
2019-03-05 09:42:58 +01: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 |
|