 Mario Vavti
|
578230e32c
|
fix typos
(cherry picked from commit d486b03089)
|
2019-03-18 21:59:09 +01:00 |
|
|
Mario Vavti
|
8559334339
|
some more xss prevention
(cherry picked from commit 968c6ed8be)
|
2019-03-18 21:37:02 +01:00 |
|
|
Mario Vavti
|
8893d9edc4
|
use urlencode
(cherry picked from commit 2ec3e4a912)
|
2019-03-18 13:31:25 +01:00 |
|
|
Mario Vavti
|
43753ec113
|
ENT_COMPAT will only take care of double-quotes. Use double-quotes here to prevent XSS
(cherry picked from commit a086745ec0)
|
2019-03-18 13:31:03 +01:00 |
|
|
Mario Vavti
|
f1fee1239b
|
Merge branch 'dev'
|
2019-03-14 09:40:26 +01:00 |
|
|
Mario
|
8769fa0156
|
Merge branch 'dev' into 'dev'
two compatibility issues zot/zot6
See merge request hubzilla/core!1553
|
2019-03-14 09:38:46 +01:00 |
|
 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 |
|
 M. Dent
|
6ed7f47b3f
|
Merge branch 'core_fixes_2' into 'dev'
add zot6 to clonable networks
See merge request hubzilla/core!1552
|
2019-03-13 18:16:33 +01:00 |
|
|
Mario Vavti
|
a3e94855f9
|
add zot6 to clonable networks
|
2019-03-13 17:48:00 +01:00 |
|
|
Mario
|
503da97a79
|
Merge branch 'dev' into 'dev'
Dev
See merge request hubzilla/core!1551
|
2019-03-13 09:40:19 +01: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
|
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 |
|
|
zotlabsandMario
|
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 |
|
|
MarioandM. Dent
|
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 |
|
|
zotlabsandMario
|
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 |
|