harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,393 Commits 6 Branches 36 Tags 152 MiB
master
Commit Graph

8246 Commits

Author SHA1 Message Date
Mario Vavti
decd0dc035 more work on event item deletion 2019-06-12 11:27:39 +02:00
zotlabs
f3b6708a92 attach sync issues 2019-06-11 18:00:42 -07:00
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
f1b54cf0a4 do not change default timezone in parse_ical_file() 2019-06-03 22:37:03 +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 Vavti
2b452ea3e8 fix timezone issue when importing adjusted events 2019-06-03 21:03:43 +02:00
Mario
66c6c6c7d1 regard timezones in calendar import/export 
(cherry picked from commit 5b4aa1afc2)
 2019-06-03 13:27:16 +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
harukin
ba9ea3f02a Merge branch 'origin' into 'develop' 
Update 4.0.3

See merge request harukin/core!52
 2019-04-28 17:52:03 +09:00
Mario Vavti
73248aadd5 possible sql performance improvement 2019-04-27 15:35:41 +02:00
zotlabs
dce5080e53 permissions cleanup 
(cherry picked from commit 2d886b65ce)
 2019-04-26 10:52:35 +02:00
zotlabs
2221d4d612 add attachments to zot6 event objects, add zot6 to federated transports (webfinger) 
(cherry picked from commit 0615709a7a)
 2019-04-26 10:43:56 +02:00
Zot
5f73a46c05 import/export zot6 hublocs+xchans 
(cherry picked from commit e2dfa1d72f)
 2019-04-26 10:42:09 +02:00
Zot
ab8d8aa552 hubloc confusion in magic auth 
(cherry picked from commit 3c8f8b76aa)
 2019-04-26 10:41:35 +02:00
Daniel Lowe
f955276694 Fix infinite loop using postgres as backend 
unescapebin is handed a string in some cases, and it causes an infinite
loop when it does.  This ensures that the argument is a resource before
loading its contents.


(cherry picked from commit 9a6531e2a2)
 2019-04-26 10:41:04 +02:00
Zot
e2dfa1d72f import/export zot6 hublocs+xchans 2019-04-26 09:34:58 +02:00
Zot
3c8f8b76aa hubloc confusion in magic auth 2019-04-25 11:54:37 +02:00
Daniel Lowe
9a6531e2a2 Fix infinite loop using postgres as backend 
unescapebin is handed a string in some cases, and it causes an infinite
loop when it does.  This ensures that the argument is a resource before
loading its contents.
 2019-04-21 11:14:17 +00: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
harukin
5f691fb05c Merge branch 'origin' into 'develop' 
Update 4.0.2

See merge request harukin/core!48
 2019-04-18 06:33:41 +09: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
Max Kostikov
509067391b Update xchan profile edited date only once 2019-04-13 14:08:44 +02:00
Max Kostikov
04b261057d Set 'os_syspath' with local path 2019-04-12 22:34:32 +02:00
Max Kostikov
852343f254 Override received 'content' if we saving thumbnail in filesystem 2019-04-12 16:27:58 +02:00
Max Kostikov
d3a619659f Fix 'os_syspath' if we store thumbnails in filesystem 2019-04-12 15:38:10 +02:00
Max Kostikov
5792f4bf07 Add comment on required changes in upcoming releases 2019-04-12 15:00:56 +02:00
Max Kostikov
3a0fa5cb29 Store thumbnails in filesystem or database 2019-04-12 14:59:13 +02:00
Max Kostikov
074ee656f0 Fetch thumbnails and store it in filesystem or DB; update xchan profile edit time on fetch 2019-04-12 14:56:07 +02:00
Max Kostikov
42f96dc7a6 Fix use UNIX socket file to connect DB 2019-04-10 14:13:16 +02:00
Mario
e96fa64625 Merge branch 'dev' into 'dev' 
Dev

See merge request hubzilla/core!1586
 2019-04-10 13:25:57 +02:00
Max Kostikov
5d70d889e9 Revert "Update htconfig.sample.php" 
This reverts commit f2126ef18c8b66020305d07dcefeacc4e55a3c12
 2019-04-10 13:25:03 +02:00
zotlabs
1ed0079882 Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev 2019-04-07 19:23:38 -07:00
Mario
4e12f86e90 Merge branch 'dev' into 'dev' 
security: perms_pending not evaluated correctly

See merge request hubzilla/core!1583
 2019-04-06 10:27:30 +02:00
zotlabs
2d886b65ce permissions cleanup 2019-04-05 18:06:59 -07:00
zotlabs
8700b87030 Merge branch 'dev' of ../hz into dev 2019-04-05 16:48:04 -07:00
zotlabs
5a46f1229d security: perms_pending not evaluated correctly 2019-04-05 16:46:52 -07:00
Mario
c9f3883c8c Remove suggest channels from features 2019-04-02 15:12:32 +02:00
zotlabs
cbaf0a3864 check service class limits when syncing files 2019-03-30 15:11:13 -07:00
Max Kostikov
7d392e5adb Merge branch 'z6_discover_fixes' into 'dev' 
fix various issues in z6_discover() and add zot6 hubloc creation on channel import

See merge request hubzilla/core!1575
 2019-03-29 15:28:28 +01:00
Mario Vavti
31680898e3 another fix for z6_discover() and create a zot6 hubloc if applicable 2019-03-28 15:51:24 +01:00
Mario Vavti
b10b8ca3f4 fix various issues in z6_discover() 2019-03-27 15:20:43 +01:00
Max Kostikov
b0c33308be Fix wrong bracket 2019-03-27 00:34:38 +01:00
Max Kostikov
f55dfc9025 Fix wrong permissions on attached images in personal messages 2019-03-27 00:17:14 +01:00
Mario Vavti
44795b65f9 if we have an uuid deduplicate by uuid otherwise by mid 2019-03-25 11:33:01 +01:00
Mario Vavti
0a28207200 fix wrong field name 2019-03-24 21:45:23 +01:00
Mario Vavti
8ca2a5832c Revert "item_store(): deduplicate by mid OR uuid" 
This reverts commit d8ce0d0df0.
 2019-03-24 21:22:20 +01:00
Mario Vavti
d8ce0d0df0 item_store(): deduplicate by mid OR uuid 2019-03-24 15:51:31 +01:00
harukin
087b45ab90 Merge branch 'origin' into 'develop' 
marge from origin 4.1

See merge request harukin/core!45
 2019-03-21 21:42:45 +09:00
Mario
f220628354 Merge branch 'dev' into 'dev' 
hubzilla core issue #1356 , permissions not getting decrypted on follow

See merge request hubzilla/core!1563
 2019-03-21 09:46:36 +01:00
Mario Vavti
322bc5dc87 another whitespace to trigger tests 2019-03-21 09:37:23 +01:00
zotlabs
75c3bda866 hubzilla core issue #1356 , permissions not getting decrypted on follow 2019-03-20 16:09:34 -07:00
Mario Vavti
b2b776169b just whitespace to trigger a new build test 2019-03-20 14:02:18 +01:00
Mario
fa1af5a2cb Video 2019-03-20 03:17:01 +01:00
zotlabs
a743feb040 Merge branch 'dev' of ../hz into dev 2019-03-18 19:10:38 -07:00
zotlabs
b028667de1 messagefilter enhancements, fix edge case in unsupported advisory privacy 2019-03-18 19:09:12 -07:00
zotlabs
026b96b8f2 clone systems apps to the extent possible, auto-configure imagick thumbnail binary during setup if possible 2019-03-17 17:56:29 -07:00
Mike Macgirvin
97009a2748 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-03-18 08:55:54 +11:00
zotlabs
a976f418e3 use php_eol for all mail header generation 2019-03-16 15:28:21 -07:00
zotlabs
3c701e780c use the php_eol constant for encoded subjects 2019-03-16 15:23:17 -07:00
Mario
e92514ee63 Merge branch 'dev' into 'dev' 
email_header_encode() producing output that is not spec compliant

See merge request hubzilla/core!1555
 2019-03-15 19:12:51 +01:00
zotlabs
8ebc517b41 Merge branch 'dev' of ../hz into dev 2019-03-14 21:19:56 -07:00
zotlabs
91b03e52f1 email_header_encode() producing lines of illegal length because header field length was not considered in length calculation. 2019-03-14 21:18:17 -07:00
Mario
ebc3666c6f Cleanup and fixes 2019-03-15 02:51:51 +01:00
zotlabs
6a8c3f82ef Merge branch 'dev' of ../hz into dev 2019-03-13 16:32:27 -07:00
zotlabs
05bcbfa28c signature issue for zot6 content imported from zotfeeds to hubzilla 2019-03-13 16:31:37 -07:00
zotlabs
a5a5ac60ba find unregistered z6 clones on hubzilla sites (does not happen automatically since z6 is not the default protocol on hubzilla). This will need to be pushed to master for the next point release. 2019-03-13 16:27:52 -07:00
Mike Macgirvin
0026849821 Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev 2019-03-13 10:40:23 +11:00
zotlabs
11116bdcb7 typos 2019-03-12 03:40:43 -07:00
zotlabs
09a5cf4e68 Merge branch 'dev' of ../hz into dev 2019-03-11 22:24:13 -07:00
zotlabs
a9172129d2 check zot6 in import_author_xchan 2019-03-11 22:17:36 -07:00
Mike Macgirvin
3ec06705ca perform zot6 discovery in import_author_xchan 2019-03-12 16:12:29 +11:00
zotlabs
5fb0d38ad8 security updates for multiple xchans 2019-03-11 16:29:12 -07:00
zotlabs
4e97fb0e58 testing init_groups_visitor changes - also add virtual groups for both zot identities 2019-03-10 22:32:37 -07:00
zotlabs
cada0b6df1 init_groups_visitor: include xchans from all zot-like networks 2019-03-10 15:50:45 -07:00
zotlabs
51024d3821 authenticated fetch fixes 2019-03-09 12:58:03 -08:00
harukin
d8d46039a2 Merge branch 'origin' into 'develop' 
marge from origin 4.0

See merge request harukin/core!40
 2019-03-09 17:48:31 +09:00
Mario Vavti
9772726065 merge text.php and hmessages.po 2019-03-08 12:32:20 +01:00
Mario Vavti
8ecdde6cb5 Merge branch '4.0RC' 2019-03-08 11:52:57 +01:00
zotlabs
beb4e00afb guest access tokens: xchan record not created on URL login 
(cherry picked from commit 0b2213dd41)
 2019-03-07 09:30:38 +01:00
Mario
3e6607585f Merge branch 'dev' into 'dev' 
guest access tokens: xchan record not created on URL login

See merge request hubzilla/core!1543
 2019-03-07 09:29:21 +01:00
zotlabs
0b2213dd41 guest access tokens: xchan record not created on URL login 2019-03-06 19:01:28 -08:00
M. Dent
a81286c795 Add CURLOPT_CONNECTTIMEOUT 
(cherry picked from commit 0c05e6593e)
 2019-03-06 09:56:01 +01:00
M. Dent
0c05e6593e Add CURLOPT_CONNECTTIMEOUT 2019-03-06 09:52:26 +01:00
DM42.Net (Matt Dent)
e37c9ed0a1 Use sender hash 
(cherry picked from commit 5febc3e07d)
 2019-03-02 15:37:22 +01:00
DM42.Net (Matt Dent)
5febc3e07d Use sender hash 2019-03-01 10:50:10 -05:00
Mario Vavti
de7f2eef47 use $channel_id until the function is adapted to not need it 2019-02-26 09:28:16 +01:00
Mario
a449ffe49d Merge branch 'fix-sync_an_item' into 'dev' 
Fix sync an item

See merge request hubzilla/core!1531
 2019-02-26 09:26:00 +01:00
Mario
04b9216758 Merge branch 'dev' into 'dev' 
zot api changes to support combined content (items+files) import addon

See merge request hubzilla/core!1533
 2019-02-25 14:06:37 +01:00
zotlabs
1ff97754af issues uncovered testing combined item/file import 2019-02-24 21:43:15 -08:00
zotlabs
20e43311db zot api changes to support combined content (items+files) import addon 2019-02-24 14:46:09 -08:00
DM42.Net (Matt Dent)
7a1a44f802 xchan_query and fetch_post_tags uses full query results not a single row 2019-02-23 21:03:05 -05:00
DM42.Net (Matt Dent)
6f8593cf47 Fixes - sync item based on item's user 2019-02-23 10:24:05 -05:00
DM42.Net (Matt Dent)
3b2efb1000 Fix misspelled variable 2019-02-23 10:09:58 -05:00
Mario Vavti
a0ad110cff fix summary and use item_normal_search() for viewsrc so we can also view the source for articles, cards, etc. 2019-02-21 08:48:47 +01:00
M.Dent
cfcbaf33af Fix: post_activity_item returns success => true even on failure. 2019-02-18 22:40:19 -05:00
Klaus Weidenbach
e6dadb215e Refactor photo_driver to use namespaces. 
Add simple UnitTest, but it is not yet very meaningful.
 2019-02-14 22:06:42 +01:00
Klaus Weidenbach
d70bba2806 Clean up and documentation in photo_drive. 2019-02-14 22:06:42 +01:00
Mario Vavti
5ab917f606 affinity tool fixes 2019-02-14 11:06:52 +01:00
harukin
4a2228a372 Merge branch 'origin' into 'develop' 
marge from origin 3.8.9

See merge request harukin/core!36
 2019-02-11 17:48:25 +09:00
zotlabs
4837f9cdad Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2019-02-07 19:54:07 -08:00
zotlabs
92e6c21210 add missing zot6 conversation completion (required for message repeats) 2019-02-07 14:13:13 -08:00