Mario
|
24f3bc9f0c
|
Channel update
|
2019-05-08 19:55:21 +02:00 |
|
Max Kostikov
|
6731564c2d
|
Update Photos.php
|
2019-05-08 08:30:25 +02:00 |
|
Max Kostikov
|
194ba0cf8d
|
Update PhotoDriver.php
|
2019-05-08 08:28:35 +02:00 |
|
Max Kostikov
|
bdcbe61273
|
Respect thumbnail storage location on image editing
|
2019-05-08 01:52:10 +02:00 |
|
Max Kostikov
|
de5d7bfbd3
|
Add photo usage detection if not exist on thumbnail save
|
2019-05-08 00:49:41 +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 Vavti
|
cd829c096b
|
update directory on cover photo changes
|
2019-05-03 14:11:14 +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 |
|
Max Kostikov
|
1e7e2bd34f
|
Update Item.php
|
2019-05-01 19:10:46 +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 |
|
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
|
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
|
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
|
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
|
327e5d06e1
|
calendar merge: implement single event editing UI
|
2019-04-30 00:09:57 +02:00 |
|
Max Kostikov
|
d9be443e53
|
Add initial threaded comments support
|
2019-04-29 23:26:20 +02:00 |
|
Max Kostikov
|
6db323b15e
|
Add variables for threaded comments support
|
2019-04-29 23:24:48 +02:00 |
|
Mario
|
674215e9e6
|
Merge branch 'dev' into 'dev'
Add jot videos inline and with poster if possible
See merge request hubzilla/core!1613
|
2019-04-29 11:58:59 +02:00 |
|
Mario Vavti
|
dce6a5763d
|
calendar merge: d&d support and some minor cleanup and fixes
|
2019-04-29 11:45:55 +02:00 |
|
zotlabs
|
9641254443
|
event attachments still weren't being delivered to zot6
|
2019-04-28 18:20:40 -07:00 |
|
zotlabs
|
95871fe13c
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-04-28 17:47:26 -07:00 |
|
Max Kostikov
|
0cecfceb14
|
Merge branch 'sql_fixes' into 'dev'
possible sql performance improvement
See merge request hubzilla/core!1611
|
2019-04-28 20:59:53 +02:00 |
|
zotlabs
|
9536a490b3
|
Add jot videos inline and with poster if possible
|
2019-04-27 17:20:38 -07:00 |
|
Mario Vavti
|
405e07f0a2
|
improve channel date query
|
2019-04-27 23:01:05 +02:00 |
|
Max Kostikov
|
d3ce91bd89
|
Merge branch 'dev' into 'dev'
Use goaway() base function
See merge request hubzilla/core!1612
|
2019-04-27 21:47:57 +02:00 |
|