Commit graph

22046 commits

Author SHA1 Message Date
zotlabs
c9e5ff4eb4 set osada specific permissionroles and features 2018-08-05 18:40:36 -07:00
zotlabs
cce9594f2b changes to channel module to support osada 2018-08-05 17:25:43 -07:00
zotlabs
d94a12cd13 issue with http sigs and implicit keys 2018-08-04 20:35:27 -07:00
zotlabs
db54ed9eb3 update readme 2018-08-04 15:13:05 -07:00
zotlabs
18ffded92a handle tombstones 2018-08-03 19:26:16 -07:00
zotlabs
60014547a2 more cleanup of owa upgrade 2018-08-03 17:03:55 -07:00
zotlabs
62ea8564fa owa issues 2018-08-03 16:03:16 -07:00
zotlabs
c6f34c7f80 more spring cleaning 2018-08-02 01:56:34 -07:00
zotlabs
818f69474b reduce the number of permission roles 2018-08-01 20:30:09 -07:00
zotlabs
082cd3953c sync and directory issues 2018-08-01 17:58:54 -07:00
zotlabs
07961d363e update readme 2018-07-31 20:23:56 -07:00
zotlabs
54bf5d32bb import announce activities from pure ActivityStreams sources 2018-07-31 20:15:00 -07:00
zotlabs
2062c154d1 more announce 2018-07-31 19:55:27 -07:00
zotlabs
4ccf54c3e9 handle announce decode better 2018-07-31 19:50:39 -07:00
zotlabs
680a7dd6b8 typo 2018-07-31 19:43:54 -07:00
zotlabs
7e723f9e79 better handling of announce 2018-07-31 19:39:50 -07:00
zotlabs
4b6fa91bb3 directory packets need to be signed 2018-07-31 19:09:42 -07:00
zotlabs
7d920bc8a2 these also 2018-07-31 17:29:10 -07:00
zotlabs
88f3ce6736 cleanup unnecessary functions 2018-07-31 17:27:50 -07:00
zotlabs
a9c3af298b prep work for converting mail 2018-07-30 23:55:09 -07:00
zotlabs
28819baa72 sort out some setup issues 2018-07-30 19:25:35 -07:00
zotlabs
a87d5aa730 Merge branch 'red' into red_merge 2018-07-30 18:22:25 -07:00
zotlabs
0cfaf34a22 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-07-30 18:11:49 -07:00
zotlabs
e8aeecc4c9 When checking permissions ignore checking site "Block Public" settings in cases where site permissions aren't applicable 2018-07-30 17:41:37 -07:00
Mario
4e402dca7d Merge branch 'patch-13' into 'dev'
Workaround on possible error with php2po

See merge request hubzilla/core!1247
2018-07-30 10:01:19 +02:00
gia vec
149071bf0c Update network.php
(cherry picked from commit 8db006d9a1b3401f79ad0458e3a2ebae64c3575c)
2018-07-30 09:48:24 +02:00
zotlabs
66ab6831cb cleanup 2018-07-29 23:49:37 -07:00
zotlabs
b97ac5acd4 missing encryption on sync 2018-07-29 23:12:05 -07:00
zotlabs
b374a6f911 more channel sync debugging 2018-07-29 22:13:43 -07:00
zotlabs
9c479be7df communication testing 2018-07-29 20:19:02 -07:00
zotlabs
d3686ffee4 missing namespace 2018-07-29 19:19:28 -07:00
zotlabs
9744d35a5c clone issues 2018-07-29 18:58:33 -07:00
zotlabs
d67f335ce8 set directory to master if no fallbacks present 2018-07-29 18:25:11 -07:00
zotlabs
c08d9a3d45 wrong update number 2018-07-29 18:22:49 -07:00
zotlabs
32614e4074 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-07-29 18:00:56 -07:00
zotlabs
9dc5a3bfc9 this may conflict 2018-07-29 17:59:40 -07:00
zotlabs
ee08b67bb6 zot6 discovery sanitisation 2018-07-29 17:54:53 -07:00
zotlabs
1def8da7bc fix unsanitised xchan_name 2018-07-29 17:36:05 -07:00
zotlabs
f7e9cd5a8f SECURITY: sanitise vcard fields 2018-07-29 17:36:05 -07:00
zotlabs
5ec73e6862 Revert "Merge branch 'red'"
This reverts commit 159f24afe3, reversing
changes made to dd899418c1.
2018-07-29 17:17:33 -07:00
zotlabs
159f24afe3 Merge branch 'red' 2018-07-29 16:48:14 -07:00
Max Kostikov
cb4afd39bd Workaround on possible error 2018-07-29 16:26:33 +02:00
Max Kostikov
e078caffd8 Update php2po.php 2018-07-29 14:20:01 +02:00
Max Kostikov
90a9febb6c Workaround on possible error 2018-07-29 12:05:53 +02:00
Mario Vavti
e4a1286aae fix sql empty query error in db update 1216 2018-07-29 08:05:41 +02:00
Mario
08a8011456 Merge branch 'patch-12' into 'dev'
Process msgctxt plurals

See merge request hubzilla/core!1246
2018-07-29 07:14:09 +02:00
Mario Vavti
643b6f0aa3 version 2018-07-29 07:00:30 +02:00
Mario Vavti
45d262d6c0 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-07-29 06:59:10 +02:00
Mario Vavti
5dbd11c6ed wrong class name 2018-07-29 06:58:35 +02:00
Mario Vavti
3fcb6df0f1 Merge remote-tracking branch 'mike/master' into dev 2018-07-29 06:43:55 +02:00