Mario
ce2216f544
Merge branch 'patch-15' into 'dev'
...
Add XMLreader in PHP requirements
See merge request hubzilla/core!1252
2018-08-08 09:07:26 +02:00
zotlabs
1d13cc1601
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2018-08-06 21:32:45 -07:00
zotlabs
e5b8b17112
Merge branch 'zap'
2018-08-06 18:53:55 -07:00
zotlabs
166879b8b0
bring some Zot6 libraries and interfaces to red/hubzilla
2018-08-06 17:43:22 -07:00
zotlabs
aeb9d5cd90
create alter_pdl hook
2018-08-05 23:19:33 -07:00
zotlabs
cedf21e55c
keep the follow url
2018-08-05 23:15:15 -07:00
zotlabs
3c74e0a649
change import compatibility
2018-08-05 22:47:41 -07:00
zotlabs
a935c8d055
more permissions sorting
2018-08-05 21:57:53 -07:00
zotlabs
3c3baac052
permissions issue
2018-08-05 21:31:25 -07:00
zotlabs
ca12803bec
permissions issue
2018-08-05 21:31:08 -07:00
zotlabs
8769e5d68d
Merge branch 'zap'
2018-08-05 18:42:31 -07:00
zotlabs
e9ccc4bc9a
make Activity::encode_person() pluggable
2018-08-05 18:41:33 -07:00
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
8e9d076216
ability for addons to create .pdl files and load them automatically
2018-08-04 13:50:49 -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
Max Kostikov
0d48cb959f
Add XMLreader in PHP requirements
2018-08-03 19:32:51 +02:00
zotlabs
d908f53607
add app_options field
2018-08-02 22:49:30 -07:00
Mario
238551b024
Merge branch 'fixactivityorderwithfilters' into 'master'
...
Add GET for filtered forums
See merge request hubzilla/core!1251
(cherry picked from commit 4e6539efec70027facb70233254e9b47f8e86c6d)
ee1fde42 Add GET for filtered forums
2018-08-02 20:17:16 +02:00
zotlabs
c6f34c7f80
more spring cleaning
2018-08-02 01:56:34 -07:00
zotlabs
c806279fa9
update certs
2018-08-01 21:32:05 -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
4d0611b7d4
hubzilla core issue #1258
2018-08-01 16:12:44 -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
Mario
c17f0fb44f
Merge branch 'dev' into 'dev'
...
Update Spanish translation
See merge request hubzilla/core!1249
2018-07-31 14:42:01 +02:00
Mario Vavti
569cd6c57c
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
2018-07-31 14:39:51 +02: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
Manuel Jiménez Friaza
edf834188d
Update Spanish translation
2018-07-30 12:03:03 +02: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