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

24164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mario Vavti
7b08f1cc8c missing use declaration 2019-03-29 15:50:10 +01: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
f44cc2b60c fix typo 2019-03-28 15:56: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
1421c4e9d3 Merge branch 'dev' into 'dev' 
Fix wrong permissions on attached images in personal messages

See merge request hubzilla/core!1574
 2019-03-27 00:26:26 +01:00
Max Kostikov
f55dfc9025 Fix wrong permissions on attached images in personal messages 2019-03-27 00:17:14 +01:00
Max Kostikov
c218970890 Merge branch 'duplicate_fixes_1' into 'dev' 
if we have an uuid deduplicate by uuid otherwise by mid

See merge request hubzilla/core!1573
 2019-03-25 12:24:36 +01:00
Mario
bd27ce2520 Merge branch 'patch-20190324a' into 'dev' 
Add ITEM_TYPE_CUSTOM support to Zotlabs/Module/Display.php

See merge request hubzilla/core!1572
 2019-03-25 11:58:38 +01:00
Mario Vavti
44795b65f9 if we have an uuid deduplicate by uuid otherwise by mid 2019-03-25 11:33:01 +01:00
DM42.Net (Matt Dent)
af84c4e6bd Add ITEM_TYPE_CUSTOM support to Zotlabs/Module/Display.php 2019-03-24 22:56:18 -04: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
Max Kostikov
333534dfe7 Merge branch 'items_fixes' into 'dev' 
item_store(): deduplicate by mid OR uuid possible fix for #1349

See merge request hubzilla/core!1570
 2019-03-24 16:45:21 +01:00
Mario Vavti
d8ce0d0df0 item_store(): deduplicate by mid OR uuid 2019-03-24 15:51:31 +01:00
M. Dent
9ebf6bcc92 Merge branch 'core_fixes' into 'dev' 
Core fixes

See merge request hubzilla/core!1569
 2019-03-24 03:20:24 +01:00
Mario
9d186e9ba3 add punify() again 2019-03-23 22:53:29 +01:00
Mario
3c3a4526bf fix typo 2019-03-23 22:49:27 +01:00
Mario
3094c2ce17 fix subthread on sys channel items 2019-03-23 22:48:52 +01:00
Mario
393494a728 fix revert accidental moving of Features.php 2019-03-23 22:01:46 +01:00
Mario
d2725c3f49 aparently we do not use underscores anymore. this fixes spaming of dreports with recipient not found entries for our own xchan 2019-03-23 21:50:50 +01:00
Mario
4d4425a5bf fix variables for xporof_locale and xprof_postcode 2019-03-23 20:57:22 +01:00
Mario
c11fbe0868 revert accidental moving of Features.php 2019-03-23 20:33:43 +01:00
Mario
c676689df0 fix 48 hours timeframe check and remove unused var in mod changeaddr 2019-03-23 20:32:15 +01:00
Mario
0f5625d721 revert accidental moving of Enotify.php 2019-03-23 20:22:11 +01:00
Mario
6f5e6bd0f1 fix typo 2019-03-23 20:17:35 +01:00
Mario
a0af092ecb fix wrong variable in unused function 2019-03-23 20:01:20 +01:00
Mario
3a07a194ab Webfinger::zot_url() requires a string (webfinger address), empty var given in update_directory_entry() 2019-03-23 19:42:22 +01:00
Mario
682ffa7cf5 db_columns() requires a string, empty var given in process_channel_sync_delivery() 2019-03-23 19:21:28 +01:00
Mario Vavti
9b696a872b bump version 2019-03-21 11:01:57 +01:00
Mario Vavti
aab515b16c optimize autoload cache and update changelog 2019-03-21 11:01:01 +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
M. Dent
8e8d7ae614 Merge branch 'video' into 'dev' 
Video

See merge request hubzilla/core!1561
 2019-03-20 03:17:01 +01:00
Mario
fa1af5a2cb Video 2019-03-20 03:17:01 +01:00
Max Kostikov
a27e4072b4 Merge branch 'update_1231' into 'dev' 
mysql: remove some unused indices and add thr_parent index. pgsql: sync...

See merge request hubzilla/core!1560
 2019-03-19 11:18:23 +01:00
Mario Vavti
fad26a49be mysql: remove some unused indices and add thr_parent index. pgsql: sync indices with mysql indices after testing on hub.disroot.org and add thr_parent 2019-03-19 10:52:10 +01:00
Mario
1742159345 Merge branch 'dev' into 'dev' 
messagefilter enhancements and fix for advisory permissions edge case

See merge request hubzilla/core!1559
 2019-03-19 09:17:39 +01:00
zotlabs
ed8d2cb482 Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev 2019-03-18 20:42:58 -07:00
zotlabs
8e1f022810 share encoding issue between hz and zap 2019-03-18 20:41:59 -07:00
Mike Macgirvin
4c25072c18 Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev 2019-03-19 13:13:21 +11:00
Mike Macgirvin
564ec32520 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-03-19 13:12:39 +11: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
M. Dent
41888f84bc Merge branch 'dev' into 'dev' 
composer: add phpmd and phpcs to require-dev

See merge request hubzilla/core!1557
 2019-03-19 00:56:29 +01:00
Mike Macgirvin
6a918dbde9 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-03-19 09:05:27 +11:00
Mario Vavti
d486b03089 fix typos 2019-03-18 21:58:18 +01:00