b9f1cb2021
Merge branch 'origin' into 'japanese'
...
Update 4.0.3
See merge request harukin/core!54
2019-04-28 18:00:17 +09:00
dce5080e53
permissions cleanup
...
(cherry picked from commit 2d886b65ce
2019-04-26 10:52:35 +02:00
2221d4d612
add attachments to zot6 event objects, add zot6 to federated transports (webfinger)
...
(cherry picked from commit 0615709a7a
2019-04-26 10:43:56 +02:00
5f73a46c05
import/export zot6 hublocs+xchans
...
(cherry picked from commit e2dfa1d72f
2019-04-26 10:42:09 +02:00
ab8d8aa552
hubloc confusion in magic auth
...
(cherry picked from commit 3c8f8b76aa
2019-04-26 10:41:35 +02:00
f955276694
Fix infinite loop using postgres as backend
...
unescapebin is handed a string in some cases, and it causes an infinite
loop when it does. This ensures that the argument is a resource before
loading its contents.
(cherry picked from commit 9a6531e2a2
2019-04-26 10:41:04 +02:00
d55f691ec0
Merge branch 'origin' into 'japanese'
...
Update 4.0.2
See merge request harukin/core!51
2019-04-18 06:40:08 +09:00
4e12f86e90
Merge branch 'dev' into 'dev'
...
security: perms_pending not evaluated correctly
See merge request hubzilla/core!1583
2019-04-06 10:27:30 +02:00
8700b87030
Merge branch 'dev' of ../hz into dev
2019-04-05 16:48:04 -07:00
5a46f1229d
security: perms_pending not evaluated correctly
2019-04-05 16:46:52 -07:00
c9f3883c8c
Remove suggest channels from features
2019-04-02 15:12:32 +02:00
cbaf0a3864
check service class limits when syncing files
2019-03-30 15:11:13 -07:00
7d392e5adb
Merge branch 'z6_discover_fixes' into 'dev'
...
fix various issues in z6_discover() and add zot6 hubloc creation on channel import
See merge request hubzilla/core!1575
2019-03-29 15:28:28 +01:00
31680898e3
another fix for z6_discover() and create a zot6 hubloc if applicable
2019-03-28 15:51:24 +01:00
b10b8ca3f4
fix various issues in z6_discover()
2019-03-27 15:20:43 +01:00
b0c33308be
Fix wrong bracket
2019-03-27 00:34:38 +01:00
f55dfc9025
Fix wrong permissions on attached images in personal messages
2019-03-27 00:17:14 +01:00
44795b65f9
if we have an uuid deduplicate by uuid otherwise by mid
2019-03-25 11:33:01 +01:00
0a28207200
fix wrong field name
2019-03-24 21:45:23 +01:00
8ca2a5832c
Revert "item_store(): deduplicate by mid OR uuid"
...
This reverts commit d8ce0d0df0
2019-03-24 21:22:20 +01:00
d8ce0d0df0
item_store(): deduplicate by mid OR uuid
2019-03-24 15:51:31 +01:00
f8b3a395fb
Merge branch 'origin' into 'japanese'
...
marge from origin 4.1
See merge request harukin/core!46
2019-03-21 21:42:57 +09:00
f220628354
Merge branch 'dev' into 'dev'
...
hubzilla core issue #1356 , permissions not getting decrypted on follow
See merge request hubzilla/core!1563
2019-03-21 09:46:36 +01:00
322bc5dc87
another whitespace to trigger tests
2019-03-21 09:37:23 +01:00
75c3bda866
hubzilla core issue #1356 , permissions not getting decrypted on follow
2019-03-20 16:09:34 -07:00
b2b776169b
just whitespace to trigger a new build test
2019-03-20 14:02:18 +01:00
fa1af5a2cb
Video
2019-03-20 03:17:01 +01:00
a743feb040
Merge branch 'dev' of ../hz into dev
2019-03-18 19:10:38 -07:00
b028667de1
messagefilter enhancements, fix edge case in unsupported advisory privacy
2019-03-18 19:09:12 -07:00
026b96b8f2
clone systems apps to the extent possible, auto-configure imagick thumbnail binary during setup if possible
2019-03-17 17:56:29 -07:00
97009a2748
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
2019-03-18 08:55:54 +11:00
a976f418e3
use php_eol for all mail header generation
2019-03-16 15:28:21 -07:00
3c701e780c
use the php_eol constant for encoded subjects
2019-03-16 15:23:17 -07:00
e92514ee63
Merge branch 'dev' into 'dev'
...
email_header_encode() producing output that is not spec compliant
See merge request hubzilla/core!1555
2019-03-15 19:12:51 +01:00
8ebc517b41
Merge branch 'dev' of ../hz into dev
2019-03-14 21:19:56 -07:00
91b03e52f1
email_header_encode() producing lines of illegal length because header field length was not considered in length calculation.
2019-03-14 21:18:17 -07:00
ebc3666c6f
Cleanup and fixes
2019-03-15 02:51:51 +01:00
6a8c3f82ef
Merge branch 'dev' of ../hz into dev
2019-03-13 16:32:27 -07:00
05bcbfa28c
signature issue for zot6 content imported from zotfeeds to hubzilla
2019-03-13 16:31:37 -07:00
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
0026849821
Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev
2019-03-13 10:40:23 +11:00
11116bdcb7
typos
2019-03-12 03:40:43 -07:00
09a5cf4e68
Merge branch 'dev' of ../hz into dev
2019-03-11 22:24:13 -07:00
a9172129d2
check zot6 in import_author_xchan
2019-03-11 22:17:36 -07:00
3ec06705ca
perform zot6 discovery in import_author_xchan
2019-03-12 16:12:29 +11:00
5fb0d38ad8
security updates for multiple xchans
2019-03-11 16:29:12 -07:00
4e97fb0e58
testing init_groups_visitor changes - also add virtual groups for both zot identities
2019-03-10 22:32:37 -07:00
cada0b6df1
init_groups_visitor: include xchans from all zot-like networks
2019-03-10 15:50:45 -07:00
51024d3821
authenticated fetch fixes
2019-03-09 12:58:03 -08:00
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
zotlabs
Daniel Lowe
Mario
Max Kostikov