harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,744 Commits 6 Branches 36 Tags
dcfe10b69118eab9795d234b68c6a310da97d383
Commit Graph

3059 Commits

Author SHA1 Message Date
Mario Vavti
d16714e84b calendar merge: cleanup 2019-05-13 11:30:13 +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
dc786bd1cc form security token for mod register ported from zap 2019-05-13 10:13:51 +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
70220d8b9c typo 2019-05-10 12:21:50 +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
Max Kostikov
b9b65d7dfb Merge branch 'dev' into 'dev' 
remove the caldav and event app and make calendar the default app

See merge request hubzilla/core!1643
 2019-05-09 19:40:47 +02:00
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
Mario Vavti
f0c292e77b remove the caldav and event app and make calendar the default app 2019-05-09 14:39:40 +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
Mario Vavti
e53650d6c6 another DB update to fix uid_mid index in item table and add xchan_photo_m index to xchan table 2019-05-08 20:12:54 +02:00
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