Max Kostikov
|
1545c78d05
|
Merge branch 'dev' into 'dev'
Add 'Create' button translation in CalDAV
See merge request hubzilla/core!1642
|
2019-05-09 14:41:12 +02:00 |
|
Max Kostikov
|
62336127e3
|
Add 'Create' button translation
|
2019-05-09 14:36:02 +02:00 |
|
Mario Vavti
|
9efd484e27
|
calendar merge: cleanup and comment out some unused code
|
2019-05-09 13:43:20 +02:00 |
|
Max Kostikov
|
6731564c2d
|
Update Photos.php
|
2019-05-08 08:30:25 +02:00 |
|
Max Kostikov
|
bdcbe61273
|
Respect thumbnail storage location on image editing
|
2019-05-08 01:52:10 +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
|
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 |
|
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 |
|
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 |
|
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
|
6230dbed2d
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-04-28 18:21:28 -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
|
13970280d9
|
Merge branch 'dev' of ../hz into dev
|
2019-04-27 17:22:00 -07: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 |
|
Max Kostikov
|
eb44201c5f
|
Use goaway() base function
|
2019-04-27 21:38:54 +02:00 |
|
Zot
|
e2dfa1d72f
|
import/export zot6 hublocs+xchans
|
2019-04-26 09:34:58 +02:00 |
|
zotlabs
|
0c1e803208
|
import/export zot6 hublocs+xchans
|
2019-04-26 00:24:58 -07:00 |
|
Zot
|
3c8f8b76aa
|
hubloc confusion in magic auth
|
2019-04-25 11:54:37 +02: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 |
|
Mario
|
e937e8fff9
|
Merge branch 'dev' into 'dev'
Add modification date in Etag hash calculation and optimize cached photos processing
See merge request hubzilla/core!1607
|
2019-04-24 21:11:19 +02:00 |
|
Mario Vavti
|
f616b2d49a
|
calendar merge: bring back event categories
|
2019-04-24 14:48:30 +02:00 |
|
Max Kostikov
|
fe84dae313
|
Optimize cached photos processing
|
2019-04-24 11:18:17 +02:00 |
|
Max Kostikov
|
9104933b18
|
Add modified date in Etag hash calculation
|
2019-04-24 11:13:17 +02:00 |
|
Mario Vavti
|
9275fd16c2
|
resolve merge conflict
|
2019-04-20 10:23:11 +02:00 |
|
Max Kostikov
|
0212de68a4
|
Merge branch 'dev' into 'dev'
Add translation to calendar event update button
See merge request hubzilla/core!1601
|
2019-04-19 21:14:29 +02:00 |
|
Max Kostikov
|
2ea9b6d409
|
Add translation to update button
|
2019-04-19 21:11:34 +02:00 |
|
Mario Vavti
|
fd87faa7a6
|
Merge branch 'dev' into calendar_merge
|
2019-04-19 19:37:06 +02:00 |
|
Mario Vavti
|
cb2d706fa1
|
provide location and description information
|
2019-04-19 19:06:01 +02:00 |
|
Mario
|
6b638ac896
|
Merge branch 'dev' into 'dev'
Add remove profile photo button
See merge request hubzilla/core!1598
|
2019-04-19 17:23:10 +02:00 |
|