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

7930 Commits

Author SHA1 Message Date
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
Mario Vavti
73248aadd5 possible sql performance improvement 2019-04-27 15:35:41 +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
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
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
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
0c05e6593e Add CURLOPT_CONNECTTIMEOUT 2019-03-06 09:52:26 +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
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
Mario Vavti
cf80f03084 Merge remote-tracking branch 'mike/master' into dev 2019-02-04 10:03:38 +01:00
zotlabs
8ff9a9ff08 fix linkify_tags() so it works with xchans across multiple protocols, also some fixes to activity parsing from upstream. 2019-02-03 16:53:49 -08:00
Mario
bf3d0c1274 Merge branch 'patch-20190201a' into 'dev' 
Add filter hooks and the ability to add buttons to the default status editor

See merge request hubzilla/core!1502
 2019-02-02 20:50:40 +01:00
M. Dent
0ded1d326c Merge branch 'dev' into 'dev' 
Prevent Hubzilla usage for SEO backlinks

See merge request hubzilla/core!1501
 2019-02-01 18:01:01 +01:00
DM42.Net (Matt Dent)
708d288121 Add filter hooks and the ability to add buttons to the default status editor 2019-02-01 09:49:11 -05:00
Max Kostikov
6462c83f69 Prevent Hubzilla usage for SEO backlinks 2019-02-01 15:47:51 +01:00
Mario Vavti
e64c5661da Merge remote-tracking branch 'mike/master' into dev 2019-01-30 09:48:07 +01:00
zotlabs
b15421826d cache embeds in the background on initial storage rather than on first access 2019-01-29 15:14:49 -08:00