harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,160 Commits 6 Branches 36 Tags
6ce8ce499e2ecfcfcdf7de7ec2cbb69bf4fea96c
Commit Graph
25160 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mario Vavti 302d2dbd51 do not check send_stream permission for comments 2019-06-27 13:11:59 +02:00
Mario 49ba3ffee6 Merge branch 'httpsig' into 'dev' 
http signature consolidation

See merge request hubzilla/core!1685
 2019-06-27 13:05:25 +02:00
zotlabs d83ce0863a Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-06-26 21:54:50 -07:00
zotlabs cf844cb27c http signature consolidation 2019-06-26 21:45:21 -07:00
Mario Vavti 5ccef18d4e port some functions from osada 2019-06-26 14:00:44 +02:00
Mario 40bbdfdf6a Merge branch 'dev' into 'dev' 
provide auto redirect from zot6 /item permalinks

See merge request hubzilla/core!1684
 2019-06-26 09:21:22 +02:00
Mario ad8ad0ccd7 Merge branch 'fix-item_export-api-path' into 'dev' 
Make export_page API endpoint match ZAP

See merge request hubzilla/core!1683
 2019-06-26 09:21:09 +02:00
Mario 1cf012650b Merge branch 'export_items-export_all' into 'dev' 
Export items export all

See merge request hubzilla/core!1680
 2019-06-26 09:20:54 +02:00
zotlabs 4f280b5497 allow api login by address or url (url will use zot6 hubloc records, address can use either zot or zot6 hubloc records) 2019-06-25 18:47:16 -07:00
zotlabs 5ee7009271 provide auto redirect from zot6 /item permalinks 2019-06-25 18:37:27 -07:00
DM42.Net (Matt Dent) 07f850ed15 Make export_page API endpoint match ZAP 2019-06-23 20:23:03 -04:00
harukin dde0c41c84 edit translation 2019-06-23 10:01:54 +09:00
Max Kostikov 1b6fbe3a2e Merge branch 'dev' into 'dev' 
Fix thumbnails processing logic on files sync

See merge request hubzilla/core!1682
 2019-06-21 23:26:12 +02:00
Max Kostikov b1b415ec5b Fix thumbnails processing logic on files sync 2019-06-21 23:15:16 +02:00
Max Kostikov 8730bbac2f Revert "Respect photo thumbnails storage in import" 
This reverts commit e8918ca149
 2019-06-21 22:42:38 +02:00
Max Kostikov e8918ca149 Respect photo thumbnails storage in import 2019-06-21 22:27:27 +02:00
DM42.Net (Matt Dent) 82478eef09 export all items except photos 2019-06-21 14:23:16 -04:00
zotlabsandMario 892e9cd835 minor zot6 compatibility issues uncovered through daily use 
(cherry picked from commit becaa3b920)
 2019-06-21 13:03:58 +02:00
Mario Vavti 3dd6499ac4 fix mid not dbesc'd. the comment was no longer true. this fixes an issue with mid's that contain single quotes 2019-06-21 10:37:09 +02:00
harukin 037da34e5d edit translation 2019-06-21 11:34:37 +09:00
harukin ad30d35663 edit translation 2019-06-21 11:02:14 +09:00
harukin 8d70b3b79e edit translation 2019-06-21 10:39:25 +09:00
Mario Vavti 109c66aea3 apply calendar encoding fixes to mod cal 
(cherry picked from commit 24b0f8e27e)
 2019-06-20 18:45:12 +02:00
Mario Vavti 24b0f8e27e apply calendar encoding fixes to mod cal 2019-06-20 18:44:23 +02:00
Mario Vavti 1a76e83fa4 fix encoding also for description and location 
(cherry picked from commit f37387de80)
 2019-06-20 18:40:57 +02:00
Mario Vavti 2fa788b01b various calendar UI improvements: make day- and weeknumbers clickable for navigation, hide start and end time fields in month view (only allday events can be generated there), remove the action arg from changeView(). 
;


(cherry picked from commit 4f705fc3f8)
 2019-06-20 18:40:39 +02:00
zotlabsandMario 028cbdcffa tweak to event title encoding to ensure it works with German, Russian, as well as angle chars 
(cherry picked from commit 952e466d91)
 2019-06-20 18:40:19 +02:00
zotlabsandMario 8aefbd911b 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 
(cherry picked from commit c1cc76119c)
 2019-06-20 18:39:58 +02:00
Mario Vavti f37387de80 fix encoding also for description and location 2019-06-20 18:34:44 +02:00
Mario Vavti 4f705fc3f8 various calendar UI improvements: make day- and weeknumbers clickable for navigation, hide start and end time fields in month view (only allday events can be generated there), remove the action arg from changeView(). 
;
 2019-06-20 18:27:46 +02:00
Mario 5b727065cf Merge branch 'dev' into 'dev' 
changes to support direct messages in zot6 (set item.item_private = 2 when...

See merge request hubzilla/core!1679
 2019-06-20 17:32:10 +02:00
zotlabs 952e466d91 tweak to event title encoding to ensure it works with German, Russian, as well as angle chars 2019-06-19 22:13:03 -07:00
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 8c92b0cd3a Merge branch 'dev' into 'dev' 
Remove cached photo location directory on delete if empty

See merge request hubzilla/core!1678
 2019-06-19 23:26:54 +02:00
Max Kostikov dd515da889 Remove cached photo location directory on delete if empty 2019-06-19 23:13:53 +02:00
Max Kostikov 2862b69d56 Merge branch 'dev' into 'dev' 
Use html_entity_decode() for cached photo URL

See merge request hubzilla/core!1677
 2019-06-19 13:26:36 +02:00
Max Kostikov db8e46184b Use html_entity_decode() for cached photo URL 2019-06-19 13:20:32 +02:00
Max Kostikov 99a7cd3cfb Merge branch 'dev' into 'dev' 
Include Zot6 hubs in the Grid scope

See merge request hubzilla/core!1676
 2019-06-19 10:29:19 +02:00
Max Kostikov 75746d714a Update zid.php 2019-06-19 09:39:56 +02:00
Max Kostikov 983d6d3b42 Include Zot6 hubs in the Grid scope 2019-06-18 22:17:50 +02:00
Max Kostikov 060dd8b020 Merge branch 'dev' into 'dev' 
Update German and Russian translations

See merge request hubzilla/core!1674
 2019-06-18 20:40:32 +02:00
Max Kostikov b5be0a2e3e Update hstrings.php 2019-06-18 20:28:23 +02:00
Max Kostikov 46a687b0a6 Update hmessages.po 2019-06-18 20:28:07 +02:00
Max Kostikov 4ff7aa4352 Update hstrings.php 2019-06-18 20:15:54 +02:00
Max Kostikov 750d1f820d Update hmessages.po 2019-06-18 20:15:40 +02:00
Mario f046a34d34 Merge branch 'patch-2' into 'master' 
Fix os_path replace for thumbnails

See merge request hubzilla/core!1673
 2019-06-18 19:17:33 +02:00
Max Kostikov 0d165920bb Merge branch 'dev' into 'dev' 
Fix os_path replace for thumbnails

See merge request hubzilla/core!1672
 2019-06-18 18:24:19 +02:00
Max Kostikov 9e3a4402e0 Fix os_path replace for thumbnails 2019-06-18 18:19:17 +02:00
Max Kostikov 34d7aea1be Fix os_path replace for thumbnails 2019-06-18 18:17:28 +02:00