Commit Graph

431 Commits

Author SHA1 Message Date
zotlabs
8ff9a9ff08 fix linkify_tags() so it works with xchans across multiple protocols, also some fixes to activity parsing from upstream. 2019-02-03 16:53:49 -08:00
Mario
c57a4cf926 Merge branch 'doku' into 'dev'
Extend documentation.

See merge request hubzilla/core!1496
2019-01-29 10:06:04 +01:00
zotlabs
753f137575 disable hyperdrive in hubzilla 2019-01-28 15:29:39 -08:00
Klaus Weidenbach
728788e3b9 Extend documentation. 2019-01-28 23:58:19 +01:00
Mario Vavti
671b6d2eda Merge remote-tracking branch 'mike/master' into dev 2019-01-28 12:48:21 +01:00
zotlabs
043f7bf2ab Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2019-01-28 02:48:57 -08:00
zotlabs
94cbc8bd31 share fixes 2019-01-27 12:38:51 -08:00
M. Dent
37b7dc8e7c Remove extraneous sync logic 2019-01-27 17:36:56 +01:00
Mario Vavti
10587e3a84 return false if http signatue is not valid 2019-01-25 10:49:17 +01:00
Mario
45dcd987c5 Merge branch 'doku' into 'dev'
Correct and extend Doxygen comments.

See merge request hubzilla/core!1485
2019-01-25 10:31:09 +01:00
Mario Vavti
960246fbb9 Merge remote-tracking branch 'mike/master' into dev 2019-01-25 09:51:36 +01:00
zotlabs
2fa274de1e support photo items between zot and zot6 2019-01-24 19:08:57 -08:00
Klaus Weidenbach
13e0151cd2 Correct and extend Doxygen comments.
Correct some documentation errors for Doxygen and add
more comments.
Document some undefined variables with @FIXME.
2019-01-23 22:25:47 +01:00
Mario Vavti
ea14398929 Merge remote-tracking branch 'mike/master' into dev 2019-01-21 12:04:01 +01:00
zotlabs
1b5dd8bbd7 comment permission fix 2019-01-20 15:09:35 -08:00
Mario Vavti
d355e57fa6 Merge remote-tracking branch 'mike/master' into dev 2019-01-18 10:09:16 +01:00
zotlabs
52305ca91b more specific network checking in several places and remove some old debugging crud 2019-01-17 14:45:53 -08:00
Mario Vavti
5aa0267936 add space 2019-01-17 20:09:19 +01:00
Mario Vavti
07f6465872 fix delivery report for zot6 connections 2019-01-17 11:39:52 +01:00
zotlabs
eda7c5369c event attendance testing continued (now works at a basic level from one direction, more testing needed) 2019-01-16 21:09:04 -08:00
zotlabs
e9f709301c more z6 event work 2019-01-16 17:32:16 -08:00
zotlabs
7e29bd10b6 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2019-01-16 16:52:21 -08:00
zotlabs
20eea2184b more work on z6 events 2019-01-16 16:50:44 -08:00
zotlabs
eaa375936f more z6 compatibility fixes 2019-01-16 15:28:30 -08:00
Mario Vavti
a1ac507a94 change logic for consistency 2019-01-16 10:02:13 +01:00
Mario Vavti
ad6eb15eac fix legacy zot dreport not passing the is_storable check 2019-01-15 22:36:01 +01:00
Mario Vavti
df4b6f0376 Merge remote-tracking branch 'mike/master' into dev 2019-01-09 10:25:04 +01:00
zotlabs
39de8e28da make Apps::get_base_apps() pluggable 2019-01-08 14:14:55 -08:00
DM42.Net (Matt Dent)
563a5088be Tweak to deal with changes that may happen within the same second. 2019-01-07 19:48:14 -05:00
zotlabs
7a55dd512a reverse activity mapping improvements 2018-12-19 20:03:31 -08:00
zotlabs
a33ed05bec fix default values for affinity tool and other information which could be lost when approving a connection without the entire form provided by connedit. 2018-12-17 11:32:59 -08:00
zotlabs
6464099364 regression: the ability to order apps messed up since adding pinned apps to the ordering 2018-12-12 19:11:30 -08:00
zotlabs
42aeb19562 partial solution for obj|tgt multiple (zot and zot6) encodings; the zot6 version will be stored under $item['obj']['asld'] 2018-12-03 20:09:57 -08:00
zotlabs
ffc3dba682 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-12-03 19:19:31 -08:00
zotlabs
1acc5ceb5f more merging 2018-12-03 19:18:20 -08:00
zotlabs
7d694dca07 more work on z6 commenting 2018-12-03 18:50:45 -08:00
Mario Vavti
237c6eed50 fallback to url if we have not got an addr
(cherry picked from commit a3ba7f0788)
2018-12-02 11:39:04 +01:00
zotlabs
c6acb6191c allow notification filtering by name or addr 2018-11-30 19:03:14 -08:00
zotlabs
c5a9b00eae Organization actor type was missing 2018-11-23 12:25:05 -08:00
zotlabs
ea235c0c67 no mention notifications from mastodon (and pleroma) 2018-11-21 20:03:58 -08:00
zotlabs
6481c9dca1 use this form instead 2018-11-19 15:20:28 -08:00
zotlabs
7aaa1973f4 push recent changes 2018-11-19 15:04:08 -08:00
zotlabs
b0689614bf datetime_convert wrong args 2018-11-15 21:14:14 -08:00
zotlabs
39d914c9df add item.uuid to relevant places 2018-11-15 16:34:09 -08:00
zotlabs
b11858bcac separate by network 2018-11-14 20:34:00 -08:00
zotlabs
ab2376f8d8 fix dreport link 2018-11-14 17:42:02 -08:00
zotlabs
cfc43f6dea Merge branch 'master' into zvi 2018-11-13 20:37:52 -08:00
zotlabs
770fdb2b7d dreport updates 2018-11-12 16:08:22 -08:00
zotlabs
4a6b45cf04 enotify::format hook for superblock 2018-11-12 11:13:36 -08:00
zotlabs
da452decf6 more z6 debugging 2018-11-11 15:12:01 -08:00