zotlabs
|
319b0acdd8
|
fix item query
|
2019-05-02 23:58:51 -07: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
|
9ef692b48c
|
Merge branch 'dev' into 'dev'
work on emoji reactions - sync with matching update to addons
See merge request hubzilla/core!1623
|
2019-05-03 08:39: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
|
7b4cb31a10
|
when removed items for unfriended connections, check if the parent has been retained, not just the item
|
2019-05-02 22:34:34 -07:00 |
|
zotlabs
|
03ce4d7e2b
|
Merge branch 'dev' of ../hz into dev
|
2019-05-02 21:19:15 -07:00 |
|
zotlabs
|
f55f5fa92a
|
emojireaction compat
|
2019-05-02 21:18:54 -07:00 |
|
zotlabs
|
76757ad1f2
|
Merge branch 'dev' of /home/macgirvin/hz into dev
|
2019-05-02 20:33:45 -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
|
b35961c53c
|
Merge branch 'dev' into 'dev'
Add check if threads are enabled globally
See merge request hubzilla/core!1621
|
2019-05-02 11:42:39 +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 |
|
Mario Vavti
|
6672299f8a
|
calendar merge: use b64 encoded mid for plink
|
2019-05-02 10:11:08 +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 |
|
Max Kostikov
|
1e7e2bd34f
|
Update Item.php
|
2019-05-01 19:10:46 +02:00 |
|
Max Kostikov
|
fa2f3d136f
|
Merge branch 'xmlify' into 'dev'
address xmlify/unxmlify performance issue
See merge request hubzilla/core!1616
|
2019-05-01 16:41:19 +02:00 |
|
Max Kostikov
|
92b6026695
|
Merge branch 'dev' into 'dev'
Use thr_parent tp handle reply on comment feature
See merge request hubzilla/core!1617
|
2019-05-01 16:10:40 +02:00 |
|
Mario Vavti
|
c9a5f21344
|
calendar merge: remove deprecated share variable
|
2019-05-01 15:52:17 +02:00 |
|
Max Kostikov
|
0174bf3722
|
Fix missprint
|
2019-05-01 15:49:17 +02:00 |
|
Max Kostikov
|
0d003e7450
|
Preserve parent_mid with threaded comments
|
2019-05-01 15:45:12 +02:00 |
|
Mario Vavti
|
8847838c43
|
address xmlify/unxmlify performance issue
|
2019-05-01 15:40:06 +02:00 |
|
Mario Vavti
|
9594ce9a8a
|
calendar merge: fix event_xchan mixup
|
2019-05-01 15:35:20 +02:00 |
|
Max Kostikov
|
4a91d09c86
|
Use thr_parent for comment replies
|
2019-05-01 15:33:59 +02:00 |
|
Max Kostikov
|
06837bd32b
|
Revert code to use thr_parent for comment replies
|
2019-05-01 15:12:01 +02:00 |
|
Mario
|
b8d8887d5a
|
Merge branch 'dev' into 'dev'
a couple of issues with the suggestions when viewing from the directory module
See merge request hubzilla/core!1615
|
2019-05-01 10:07:07 +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 |
|
zotlabs
|
e0fdafc7e5
|
Merge branch 'dev' of ../hz into dev
|
2019-04-30 23:39:56 -07:00 |
|
zotlabs
|
9a55df245f
|
disable directory options when using suggestion mode and only return one page (60 items)
so that sorting works correctly
|
2019-04-30 23:38:48 -07:00 |
|
zotlabs
|
9800d95c50
|
fix suggestion ordering in directory module
|
2019-04-30 23:19:04 -07:00 |
|
Max Kostikov
|
c340416c94
|
Add 'reply on comment' code
|
2019-05-01 06:24:58 +02:00 |
|
Max Kostikov
|
9af8a1d30c
|
Move JS to main module
|
2019-05-01 06:23:56 +02:00 |
|
Max Kostikov
|
4da96ee980
|
Remove 'doreply' JS function
|
2019-04-30 17:35:53 +02:00 |
|
Max Kostikov
|
21637e033c
|
Add JS 'doreply' function
|
2019-04-30 17:34:56 +02:00 |
|
Max Kostikov
|
9ebf2dc97b
|
Add "reply to" hint to submit button
|
2019-04-30 17:33:54 +02:00 |
|
Mario Vavti
|
a04689b784
|
do not allow editing events that do not belong to us
|
2019-04-30 12:08:19 +02:00 |
|
Max Kostikov
|
5066945adc
|
Fix add multiple icons on 'Submit' button when reply on comment
|
2019-04-30 11:17:22 +02:00 |
|
Max Kostikov
|
e945c12856
|
Add displaying support for threaded comments
|
2019-04-30 11:00:13 +02:00 |
|
Mario Vavti
|
0b062d0b8a
|
select event by event_hash instead of item_id
|
2019-04-30 10:47:48 +02:00 |
|
Mario Vavti
|
9cc1eff15c
|
remove logging
|
2019-04-30 00:12:19 +02:00 |
|
Mario Vavti
|
327e5d06e1
|
calendar merge: implement single event editing UI
|
2019-04-30 00:09:57 +02:00 |
|
Max Kostikov
|
a2dd0aea92
|
Merge branch 'cherry-pick-80ca2023' into 'dev'
Add 'reply on comment' feature
See merge request kostikov/core!1
|
2019-04-29 23:45:58 +02:00 |
|
Max Kostikov
|
39da3459c7
|
Add 'reply on comment' feature
(cherry picked from commit 80ca2023aa67ef7c0c43414acaf135e5748044b2)
|
2019-04-29 23:43:11 +02:00 |
|