zotlabs
|
776074b24f
|
translate make-friend activities to zot6
|
2019-05-20 19:03:10 -07:00 |
|
zotlabs
|
d7026fe36b
|
use 'cache' flag to bbcode() on content destined for Zot6. We've seen rendered map HTML in a couple of places and these should never be rendered for outgoing content as they will only be purified on the other end.
|
2019-05-09 22:06:32 -07:00 |
|
Mario Vavti
|
f0c292e77b
|
remove the caldav and event app and make calendar the default app
|
2019-05-09 14:39:40 +02:00 |
|
Max Kostikov
|
89a3e8fcc7
|
Use own variable for "Go to previous comment" hint
|
2019-05-05 18:10:53 +02:00 |
|
Max Kostikov
|
6cd968b53b
|
Add arrows to scroll between related comments
|
2019-05-05 14:14:07 +02:00 |
|
Mario Vavti
|
1da4602567
|
port db update improvements from zap
|
2019-05-03 15:13:13 +02:00 |
|
Mario
|
c605c46f83
|
Merge branch 'replyto_fixes' into 'dev'
provide xchan_url if there is no xchan_addr
See merge request hubzilla/core!1622
|
2019-05-03 08:41:01 +02:00 |
|
Mario
|
6da4dfe605
|
Merge branch 'unfriend_delete_posts_bug' into 'dev'
Unfriend delete posts bug
See merge request hubzilla/core!1624
|
2019-05-03 08:36:58 +02:00 |
|
zotlabs
|
f55f5fa92a
|
emojireaction compat
|
2019-05-02 21:18:54 -07:00 |
|
zotlabs
|
347e88dc65
|
move apschema to core to use for emojiReaction mapping for zot6
|
2019-05-02 20:32:26 -07:00 |
|
Mario Vavti
|
746d032e58
|
more provide xchan_url if there is no xchan_addr
|
2019-05-02 13:05:52 +02:00 |
|
Mario Vavti
|
b6d598a001
|
provide xchan_url if there is no xchan_addr
|
2019-05-02 12:58:24 +02:00 |
|
Max Kostikov
|
47fba5827b
|
Merge branch 'dev' into 'dev'
# Conflicts:
# Zotlabs/Lib/ThreadItem.php
|
2019-05-02 11:33:07 +02:00 |
|
Max Kostikov
|
47f75ad8bf
|
Add check if threads are enabled globally
|
2019-05-02 11:28:29 +02:00 |
|
Max Kostikov
|
516167c0f8
|
Revert "Merge branch 'dev' into 'dev'"
This reverts merge request !1620
|
2019-05-02 10:58:00 +02:00 |
|
Mario
|
238b3a97a8
|
Merge branch 'dev' into 'dev'
Check if 'reply on comment' enabled for this profile
See merge request hubzilla/core!1620
|
2019-05-02 10:48:55 +02:00 |
|
Max Kostikov
|
d4ab8a5a5d
|
Check if 'reply on comment' enabled for this profile
|
2019-05-02 10:40:33 +02:00 |
|
Max Kostikov
|
ea5f515f18
|
Merge branch 'dev' into 'dev'
Add Zap threads support
See merge request hubzilla/core!1619
|
2019-05-02 08:33:51 +02:00 |
|
Max Kostikov
|
ea6293544d
|
Add Zap threads support
|
2019-05-02 08:30:38 +02:00 |
|
Max Kostikov
|
cbe35281b9
|
Merge branch 'dev' into 'dev'
Add AS threaded comments support
See merge request hubzilla/core!1618
|
2019-05-01 21:45:12 +02:00 |
|
Max Kostikov
|
51a0fc45e2
|
Add threaded comments support
|
2019-05-01 21:40:43 +02:00 |
|
Mario
|
256f8dd41b
|
Merge branch 'dev' into 'dev'
Add 'reply on comment' feature
See merge request hubzilla/core!1614
|
2019-05-01 10:06:24 +02:00 |
|
Max Kostikov
|
9ebf2dc97b
|
Add "reply to" hint to submit button
|
2019-04-30 17:33:54 +02:00 |
|
Max Kostikov
|
6db323b15e
|
Add variables for threaded comments support
|
2019-04-29 23:24:48 +02:00 |
|
zotlabs
|
9641254443
|
event attachments still weren't being delivered to zot6
|
2019-04-28 18:20:40 -07:00 |
|
zotlabs
|
c88286556a
|
hubloc confusion during magic auth where hublocs with more than one network may exist
|
2019-04-24 16:21:59 -07:00 |
|
zotlabs
|
999ae6eb49
|
typo
|
2019-04-08 17:03:08 -07:00 |
|
zotlabs
|
ae1450bbcf
|
missing endTime on Zot6 encoded events, optimise the url fetch of embedphotos
|
2019-04-08 16:45:07 -07:00 |
|
Mario
|
9d186e9ba3
|
add punify() again
|
2019-03-23 22:53:29 +01:00 |
|
Mario
|
d2725c3f49
|
aparently we do not use underscores anymore. this fixes spaming of dreports with recipient not found entries for our own xchan
|
2019-03-23 21:50:50 +01:00 |
|
Mario
|
0f5625d721
|
revert accidental moving of Enotify.php
|
2019-03-23 20:22:11 +01:00 |
|
Mario
|
6f5e6bd0f1
|
fix typo
|
2019-03-23 20:17:35 +01:00 |
|
Mario
|
a0af092ecb
|
fix wrong variable in unused function
|
2019-03-23 20:01:20 +01:00 |
|
Mario
|
3a07a194ab
|
Webfinger::zot_url() requires a string (webfinger address), empty var given in update_directory_entry()
|
2019-03-23 19:42:22 +01:00 |
|
Mario
|
682ffa7cf5
|
db_columns() requires a string, empty var given in process_channel_sync_delivery()
|
2019-03-23 19:21:28 +01:00 |
|
zotlabs
|
8e1f022810
|
share encoding issue between hz and zap
|
2019-03-18 20:41:59 -07:00 |
|
zotlabs
|
b028667de1
|
messagefilter enhancements, fix edge case in unsupported advisory privacy
|
2019-03-18 19:09:12 -07:00 |
|
Mike Macgirvin
|
97009a2748
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-03-18 08:55:54 +11:00 |
|
zotlabs
|
a976f418e3
|
use php_eol for all mail header generation
|
2019-03-16 15:28:21 -07:00 |
|
Mario
|
ebc3666c6f
|
Cleanup and fixes
|
2019-03-15 02:51:51 +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
|
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 |
|
zotlabs
|
1f7622e4c4
|
fetch private objects using delivery channel credentials
|
2019-03-07 15:45:42 -08:00 |
|
zotlabs
|
26e7da0b96
|
channel_type is not integer
|
2019-03-05 17:06:42 -08:00 |
|
zotlabs
|
98b1c7a38c
|
maintain compatibility with recent zot6 changes
|
2019-03-05 16:57:32 -08:00 |
|
zotlabs
|
47001c3303
|
api_router - allow parameters as final path argument
|
2019-03-04 20:11:43 -08:00 |
|
zotlabs
|
9ede57b228
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-03-04 14:50:33 -08:00 |
|
Mario Vavti
|
117a8cafca
|
while in legacy zot $sender is expected to be an array, in zot6 $sender is expected to be a string (xchan_hash)
|
2019-03-02 15:50:53 +01:00 |
|
zotlabs
|
29cb62af3d
|
translate name of content filter (addon) app.
|
2019-02-28 17:51:13 -08:00 |
|
zotlabs
|
175f78fa84
|
support zot location independent urls
|
2019-02-18 18:16:50 -08:00 |
|
Mario Vavti
|
0207b5ba8b
|
disable repeats until issues are resolved
|
2019-02-14 11:32:43 +01:00 |
|
phani00
|
fc223f5924
|
affinity slider as app
|
2019-02-14 09:56:53 +01:00 |
|
M.Dent
|
c3e2b463e4
|
Only cascade privacy warning if thread parent has privacy concerns.
|
2019-02-13 08:26:03 -05:00 |
|
M.Dent
|
5b3ea012ab
|
Fix: only first lock red with privacy_warning
|
2019-02-12 22:05:57 -05:00 |
|
M.Dent
|
cbf6d53e84
|
Get all listeners
|
2019-02-11 20:24:17 -05:00 |
|
Mario Vavti
|
f52a532771
|
use ACTIVITY_SHARE to match the verb
|
2019-02-08 11:33:01 +01:00 |
|
zotlabs
|
4837f9cdad
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2019-02-07 19:54:07 -08:00 |
|
zotlabs
|
317c53acf6
|
disable repeat unless mid is a resolvable uri since this will do radically different things on different network stacks (e.g. Diaspora) and it turns out there is no possible way to make Diaspora reshares compatible with ActivityPub or Zot6 repeat/announce/boost/whatever.
|
2019-02-07 14:38:05 -08:00 |
|
zotlabs
|
92e6c21210
|
add missing zot6 conversation completion (required for message repeats)
|
2019-02-07 14:13:13 -08:00 |
|
Mario Vavti
|
d70f0092f7
|
Merge remote-tracking branch 'mike/master' into dev
|
2019-02-07 09:34:22 +01:00 |
|
zotlabs
|
29c1797493
|
work on repeat/share for Hubzilla
|
2019-02-06 17:26:09 -08:00 |
|
Mario Vavti
|
860dead985
|
Merge remote-tracking branch 'mike/master' into dev
|
2019-02-06 06:46:05 +01:00 |
|
zotlabs
|
518ceb53a8
|
allow conversation completion for new comments to expired posts, regardless of hyperdrive settings.
Note that hyperdrive conversations may still be fetched from zap/osada servers but will be ignored.
|
2019-02-05 14:51:01 -08:00 |
|
Mario Vavti
|
cf80f03084
|
Merge remote-tracking branch 'mike/master' into dev
|
2019-02-04 10:03:38 +01:00 |
|
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 |
|
M. Dent
|
ad4dd2def5
|
Set lock red and provide warning if a forum is tagged in the post
|
2019-02-01 09:29:59 +01:00 |
|
Mario
|
004246163d
|
starring and filing is only supported for post item type
|
2019-01-31 18:39:07 +01: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 |
|