harukin
|
76e879e5de
|
Merge branch 'origin' into 'develop'
Update 4.2
See merge request harukin/core!55
|
2019-06-09 10:54:57 +09:00 |
|
Mario Vavti
|
24cb04c346
|
do not change default timezone in parse_ical_file()
(cherry picked from commit f1b54cf0a4)
|
2019-06-03 22:43:20 +02:00 |
|
Mario Vavti
|
e64a7b87a8
|
fix timezone issue when importing adjusted events
(cherry picked from commit 2b452ea3e8)
|
2019-06-03 21:04:51 +02:00 |
|
Mario
|
5b4aa1afc2
|
regard timezones in calendar import/export
|
2019-06-03 13:25:48 +02:00 |
|
Max Kostikov
|
7e26ee5a73
|
Merge branch 'dev' into 'dev'
Add single photo URL rewrite for clonned channel
See merge request hubzilla/core!1663
|
2019-05-30 13:45:20 +02:00 |
|
Max Kostikov
|
a8e25ccfe6
|
Add single photo URL rewrite for clonned channel
|
2019-05-30 13:41:32 +02:00 |
|
zotlabs
|
620fc06b6c
|
anomolies in calls to datetime_convert in include/import
|
2019-05-28 23:14:22 -07:00 |
|
Mario Vavti
|
f1b61d5882
|
mod cal band-aid fixes
|
2019-05-26 20:22:40 +02:00 |
|
Mario Vavti
|
e466d72058
|
adjust birthday handling according to community decision and slightly change display of allday event items
|
2019-05-26 18:05:11 +02:00 |
|
Mario Vavti
|
528b9b6a60
|
fix #1374
|
2019-05-24 10:27:45 +02:00 |
|
Mario Vavti
|
39613aa2d9
|
improve timezone detection for caldav and remove smart birthday feature. Force adjust birthdays until we agree on how to deal with this.
|
2019-05-22 12:40:37 +02:00 |
|
Mario Vavti
|
c9d64d75f3
|
move smart birthday feature to calendar settings and override the adjust flag at display time instead of import
|
2019-05-20 13:51:53 +02:00 |
|
Mario Vavti
|
2d0f96d28b
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-05-20 12:27:00 +02:00 |
|
Mario Vavti
|
34d1f79777
|
calendar merge: initial commit for timezone support
|
2019-05-20 12:26:33 +02:00 |
|
Xanthor
|
af2b263bc7
|
Fix a really disturbing comment
(cherry picked from commit 823c0434eb)
|
2019-05-17 12:25:22 +02:00 |
|
Mario Vavti
|
3c8867a1e8
|
missing backslash
|
2019-05-15 11:38:23 +02:00 |
|
Mario
|
71ecb470b6
|
Merge branch 'dev' into 'dev'
bbcode map bypass wasn't catching all map forms.
See merge request hubzilla/core!1647
|
2019-05-14 09:10:48 +02:00 |
|
zotlabs
|
436293713b
|
bbcode map bypass wasn't catching all map forms.
|
2019-05-13 05:14:43 -07:00 |
|
Mario Vavti
|
fbe8d6144a
|
port db_indexes() from zap
|
2019-05-13 10:46:12 +02:00 |
|
Mario Vavti
|
d5f59a57bf
|
don't do oembed processing on naked links and smarty lib cleanup. ported from zap.
|
2019-05-13 10:39:40 +02:00 |
|
Mario Vavti
|
7465c79884
|
optimise oembed pdf processing so we do not actually load the content, which could cause performance issues. ported from zap.
|
2019-05-13 10:28:06 +02:00 |
|
Mario Vavti
|
973d91d120
|
add btlogger to unxmlify()
|
2019-05-11 16:42:53 +02:00 |
|
Max Kostikov
|
bf5deace8e
|
Merge branch 'dev' into 'dev'
Replace photo URL for gallery on clonned channel post sync
See merge request hubzilla/core!1645
|
2019-05-11 15:46:16 +02:00 |
|
Max Kostikov
|
0e4acf6299
|
Replace photo URL for gallery on clonned channel post sync
|
2019-05-11 15:40:04 +02:00 |
|
Mario
|
a5cd0061c5
|
Merge branch 'dev' into 'dev'
use 'cache' flag to bbcode() on content destined for Zot6. We've seen rendered...
See merge request hubzilla/core!1644
|
2019-05-11 15:39:31 +02:00 |
|
Mario Vavti
|
274f69526f
|
calendar merge: implement channel calendar import in cdav/calendar
|
2019-05-10 12:18:37 +02: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
|
9efd484e27
|
calendar merge: cleanup and comment out some unused code
|
2019-05-09 13:43:20 +02:00 |
|
Max Kostikov
|
ea19d59fca
|
Merge branch 'dev' into 'dev'
Replace own image URL in clonned channel posts
See merge request hubzilla/core!1638
|
2019-05-08 10:43:06 +02:00 |
|
Max Kostikov
|
d34d14c1f4
|
Replace own image URL in clonned channel posts
|
2019-05-08 10:40:46 +02:00 |
|
Mario
|
242878c45c
|
Merge branch 'dev' into 'dev'
possible xchan confusion include/follow
See merge request hubzilla/core!1635
|
2019-05-06 13:49:17 +02:00 |
|
zotlabs
|
c0911da887
|
review of last commit
|
2019-05-06 04:19:54 -07:00 |
|
zotlabs
|
6e0bf04276
|
possible xchan (protocol) confusion in include/follow
|
2019-05-06 04:15:34 -07:00 |
|
Max Kostikov
|
f0933b66a9
|
Remove 'os_syspath' from direct 'photo' table update
|
2019-05-06 10:39:47 +02:00 |
|
Max Kostikov
|
6cd968b53b
|
Add arrows to scroll between related comments
|
2019-05-05 14:14:07 +02:00 |
|
zotlabs
|
88d283a89d
|
found another case where channel_r_photos could get referenced
|
2019-05-04 02:58:57 -07:00 |
|
zotlabs
|
20bf139b3f
|
strip obsolete channel_(rw)_photos from channel sync packets
|
2019-05-03 15:27:26 -07: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
|
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
|
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 |
|
Mario Vavti
|
6672299f8a
|
calendar merge: use b64 encoded mid for plink
|
2019-05-02 10:11:08 +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 |
|
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
|
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
|
39da3459c7
|
Add 'reply on comment' feature
(cherry picked from commit 80ca2023aa67ef7c0c43414acaf135e5748044b2)
|
2019-04-29 23:43:11 +02:00 |
|
Max Kostikov
|
5abbfd3f19
|
Add initial threaded comment support
|
2019-04-29 23:21:17 +02:00 |
|