Commit Graph

3108 Commits

Author SHA1 Message Date
zotlabs
c1cc76119c events: don't use htmlentities on local (hz) event titles as they are not being used in textareas and umlauts for instance are getting mangled on the calendar display 2019-06-19 21:41:46 -07:00
zotlabs
9d156141b1 changes to support direct messages in zot6 (set item.item_private = 2 when private mentions are used and federate with zot:directMessage attribute which aligns with litepub:directMessage) 2019-06-19 17:32:38 -07:00
Max Kostikov
dd515da889 Remove cached photo location directory on delete if empty 2019-06-19 23:13:53 +02:00
Max Kostikov
db8e46184b Use html_entity_decode() for cached photo URL 2019-06-19 13:20:32 +02:00
Max Kostikov
a677a68ab7 Avoid to process original images using storeThumbnail 2019-06-18 11:31:14 +02:00
Mario
fc2a038ee1 Merge branch 'dev' into 'dev'
minor zot6 compatibility issues uncovered through daily use

See merge request hubzilla/core!1671
2019-06-18 10:35:50 +02:00
Mario Vavti
619b39f955 fix typo 2019-06-18 10:33:30 +02:00
zotlabs
becaa3b920 minor zot6 compatibility issues uncovered through daily use 2019-06-17 18:30:05 -07:00
Mario Vavti
9507f191b0 disable events module. it is now disfunctional 2019-06-17 10:16:49 +02:00
Mario Vavti
8535eb7bf5 update feature set 2019-06-17 10:10:44 +02:00
Mario Vavti
c9604eaabf revisit mod cal 2019-06-17 10:07:00 +02:00
Max Kostikov
43cec4398d base64 encode message signature 2019-06-15 16:03:35 +02:00
Max Kostikov
335394aaa1 Add base64 decode if signature encoded 2019-06-15 15:58:55 +02:00
Max Kostikov
c9615cc19c Formatting 2019-06-14 21:08:53 +02:00
Max Kostikov
4da3933f24 Add signatures processing for private messages 2019-06-14 20:52:21 +02:00
Mario Vavti
a26774b99e fix mod cal regression 2019-06-14 09:52:54 +02:00
Mario
9258593776 Merge branch 'dev' into 'dev'
zot6 protocol edge case

See merge request hubzilla/core!1669
2019-06-14 09:13:57 +02:00
zotlabs
57ed9ec8e2 zot6 protocol edge case 2019-06-13 18:28:33 -07:00
Mario Vavti
801ab611ed more work on linked item/resource deletion for photos and events, deprecate the force flag in drop_item() and comment out goaway() in drop_item(). 2019-06-13 13:34:04 +02:00
Mario Vavti
bc34167c84 port delete fixes from zap 2019-06-12 12:46:29 +02:00
Mario Vavti
decd0dc035 more work on event item deletion 2019-06-12 11:27:39 +02:00
Mario Vavti
9ac9c693ad initial support for deleting event items if an event is removed 2019-06-12 10:07:18 +02:00
zotlabs
b3f1a19db6 zot6 deletion issue 2019-06-11 20:22:57 -07:00
Mario Vavti
ebc2b23c3a fix embedphotos image size 2019-06-07 08:45:08 +02:00
Mario
66c6c6c7d1 regard timezones in calendar import/export
(cherry picked from commit 5b4aa1afc2)
2019-06-03 13:27:16 +02:00
zotlabs
c7476a1d96 fix category widget when using articles 2019-05-31 14:19:04 -07:00
zotlabs
b6267ec7c2 live-update not triggering on mod_search 2019-05-29 17:04:27 -07:00
zotlabs
0fa4c89a1b convert AS "instrument" objects to the more appropriate "generator" - this probably should happen in pubcrawl addon also 2019-05-28 20:23:03 -07:00
zotlabs
1bf046c142 Revert "another forum -> group wording change" (wrong tree)
This reverts commit 7c2aafd4ee.
2019-05-28 16:35:41 -07:00
zotlabs
52f8429218 support 'expires' over Zot6 2019-05-28 16:28:03 -07:00
zotlabs
932b414063 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-05-28 16:16:29 -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
9ea483d1dc get channel from photo uid 2019-05-24 09:57:46 +02:00
Mario
94d4bc4bac Merge branch 'dev' into 'dev'
translate make-friend activities to zot6

See merge request hubzilla/core!1654
2019-05-22 12:59:41 +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
zotlabs
7c2aafd4ee another forum -> group wording change 2019-05-21 18:23:45 -07:00
Mario Vavti
e834c7fe3e remove unused code 2019-05-21 12:31:50 +02:00
Mario Vavti
f96958adf8 fix all day events for caldav calendars 2019-05-21 12:29:00 +02:00
zotlabs
776074b24f translate make-friend activities to zot6 2019-05-20 19:03:10 -07: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
9651689bb8 fix event notifications viewall url 2019-05-20 13:14:54 +02:00
Mario Vavti
e44f0c497f be more precise with table selection 2019-05-20 12:34:05 +02:00
Mario Vavti
34d1f79777 calendar merge: initial commit for timezone support 2019-05-20 12:26:33 +02:00
Mario Vavti
aa120e0478 wiki: urlencode the entire share link 2019-05-17 12:24:25 +02:00
Mario Vavti
e7f1f496c5 use escape_tags() wiki headers 2019-05-17 11:57:41 +02:00
Mario Vavti
8be0031602 calendar merge: only export events that will not break the importer. this will probably dismiss some old experimental entries 2019-05-15 18:21:52 +02:00
Mario Vavti
15a000bb45 add autocomplete js to calendar and fix issue with extended likes mid 2019-05-14 09:09:48 +02:00
Mario Vavti
71064f481b deal with privacy mentions in event descriptions 2019-05-13 15:45:05 +02:00
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
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
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
Mario Vavti
2bd5ae3617 provide link to source and some cleanup 2019-04-19 17:21:45 +02:00
Mario Vavti
39a5311315 Merge branch 'dev' into calendar_merge 2019-04-19 15:34:02 +02:00
Mario Vavti
9b6e46dc6b calendar merge initial commit 2019-04-19 15:32:56 +02:00
Max Kostikov
7311d1182d Add remove profile photo button 2019-04-19 15:30:05 +02:00
Mario
fb03e3f00e Merge branch 'dev' into 'dev'
required php version not available but allowed to continue

See merge request hubzilla/core!1597
2019-04-19 15:19:43 +02:00
Mario
c9c35255e7 Merge branch 'dev' into 'dev'
Precise cache related headers processing; remove duplicated code and optimization

See merge request hubzilla/core!1596
2019-04-19 15:19:19 +02:00
zotlabs
6feddcbced required php version not available but allowed to continue 2019-04-18 13:53:39 -07:00
Max Kostikov
db020ca1a3 Update Photo.php 2019-04-18 21:55:06 +02:00
Max Kostikov
6c93518ef7 Merge branch 'dev' into 'dev'
add attachments to zot6 event objects, add zot6 to federated transports (webfinger)

See merge request hubzilla/core!1593
2019-04-18 20:59:41 +02:00
Max Kostikov
eb02d01eed Update Photo.php 2019-04-18 10:13:03 +02:00
Max Kostikov
7a9093f634 Implement ETag: header support for cache control 2019-04-18 09:50:37 +02:00
Max Kostikov
1732b2dfe3 Add 'must-revalidate' to Cache-control header for profile photos 2019-04-17 23:15:46 +02:00
Max Kostikov
a62f891a60 Precise 'Modified:' header processing if no profile photo added; remove duplicated code 2019-04-17 18:30:50 +02:00
Max Kostikov
c490970324 Fix file path with filesystem storage 2019-04-16 22:24:48 +02:00
zotlabs
df5a1c59e6 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-04-15 20:53:44 -07:00
zotlabs
0615709a7a add attachments to zot6 event objects, add zot6 to federated transports (webfinger) 2019-04-15 20:51:57 -07:00
Mario
9c8cb4dea3 Merge branch 'dev' into 'dev'
Thumbnails storage in filesystem or database implementation

See merge request hubzilla/core!1588
2019-04-13 21:19:06 +02:00
Max Kostikov
ed902fdb70 Update photo usage only for thumbnails 2019-04-13 14:12:58 +02:00
Max Kostikov
26e35344d0 Add multiple profiles support on image operations in photo driver 2019-04-12 15:53:00 +02:00
Max Kostikov
979f2415fb Save profile photo in filesystem or database; more precise modification time processing 2019-04-12 15:06:59 +02:00
Max Kostikov
28c1d219f6 Save cover photo thumbnails in filesystem or database 2019-04-12 15:03:59 +02:00
Max Kostikov
4b5922f652 Fix wrong image resolution selection 2019-04-10 22:09:10 +02:00
Max Kostikov
85be906b68 Fix image scale on thumbnail save 2019-04-10 14:44:50 +02:00