Max Kostikov
|
9b947c8370
|
Merge branch 'dev' into 'dev'
Threaded comments usability imrovements
See merge request hubzilla/core!1633
|
2019-05-05 18:15:58 +02:00 |
|
Max Kostikov
|
14eb4326e7
|
Scroll back to initial low level comment
|
2019-05-05 18:13:00 +02:00 |
|
Max Kostikov
|
89a3e8fcc7
|
Use own variable for "Go to previous comment" hint
|
2019-05-05 18:10:53 +02:00 |
|
Max Kostikov
|
6fd5133bed
|
Force to add "go to previous comment" hint
|
2019-05-05 18:09:25 +02:00 |
|
Max Kostikov
|
e010877490
|
Scroll back if more than one level in thread
|
2019-05-05 18:07:44 +02:00 |
|
Max Kostikov
|
f56371c79b
|
Merge branch 'dev' into 'dev'
Threaded comments navigation elements fixes
See merge request hubzilla/core!1632
|
2019-05-05 15:41:17 +02:00 |
|
Max Kostikov
|
c98f3c5d29
|
Threaded comments navigation elements fixes
|
2019-05-05 15:38:08 +02:00 |
|
Max Kostikov
|
5c8de9d82f
|
Allign arrows position
|
2019-05-05 14:28:15 +02:00 |
|
Mario
|
b9c8b6ba23
|
Merge branch 'dev' into 'dev'
Add arrows to scroll between related comments
See merge request hubzilla/core!1629
|
2019-05-05 14:14:07 +02:00 |
|
Max Kostikov
|
6cd968b53b
|
Add arrows to scroll between related comments
|
2019-05-05 14:14:07 +02:00 |
|
Max Kostikov
|
2aa76d257c
|
Merge branch 'db_update' into 'dev'
port db update improvements from zap
See merge request hubzilla/core!1628
|
2019-05-04 22:37:21 +02:00 |
|
Max Kostikov
|
32c0be8bde
|
Merge branch 'dev' into 'dev'
found another case where channel_r_photos could get referenced
See merge request hubzilla/core!1631
|
2019-05-04 12:05:38 +02:00 |
|
zotlabs
|
88d283a89d
|
found another case where channel_r_photos could get referenced
|
2019-05-04 02:58:57 -07:00 |
|
Max Kostikov
|
66b370c421
|
Merge branch 'dev' into 'dev'
strip obsolete channel_(rw)_photos from channel sync packets
See merge request hubzilla/core!1630
|
2019-05-04 10:32:31 +02:00 |
|
zotlabs
|
20bf139b3f
|
strip obsolete channel_(rw)_photos from channel sync packets
|
2019-05-03 15:27:26 -07:00 |
|
Mario Vavti
|
1da4602567
|
port db update improvements from zap
|
2019-05-03 15:13:13 +02:00 |
|
Max Kostikov
|
e7ef69e6e7
|
Merge branch 'dev' into 'dev'
Update Russian translation
See merge request hubzilla/core!1627
|
2019-05-03 14:59:58 +02:00 |
|
Max Kostikov
|
d55904d4db
|
Update hstrings.php
|
2019-05-03 14:52:43 +02:00 |
|
Max Kostikov
|
740dc59255
|
Update hmessages.po
|
2019-05-03 14:52:08 +02:00 |
|
Mario
|
98b6362c07
|
Merge branch 'dev' into 'dev'
removing items from ex-connections turns out to be more complicated than originally envisioned
See merge request hubzilla/core!1626
|
2019-05-03 14:16:56 +02:00 |
|
Mario Vavti
|
cd829c096b
|
update directory on cover photo changes
|
2019-05-03 14:11:14 +02:00 |
|
zotlabs
|
f127c55802
|
removing items from ex-connections turns out to be more complicated than originally envisioned
|
2019-05-03 04:09:04 -07:00 |
|
zotlabs
|
13247a0e00
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-05-03 04:04:02 -07:00 |
|
Max Kostikov
|
609752d331
|
Merge branch 'revert-3528610a' into 'dev'
Revert "Fix comment edit field expansion on reply on comment"
See merge request kostikov/core!1
|
2019-05-03 10:09:54 +02:00 |
|
Max Kostikov
|
413410d02d
|
Revert "Fix comment edit field expansion on reply on comment"
This reverts commit 3528610a51
|
2019-05-03 10:09:54 +02:00 |
|
Max Kostikov
|
3528610a51
|
Fix comment edit field expansion on reply on comment
|
2019-05-03 10:03:40 +02:00 |
|
Mario Vavti
|
59ee045c24
|
parent -> id
|
2019-05-03 09:01:53 +02:00 |
|
zotlabs
|
b1dec12893
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-05-03 00:00:00 -07:00 |
|
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 |
|