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

23861 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zotlabs
b9cef2f38f command line tool for managing site admins 2019-01-26 12:17:52 -08:00
zotlabs
2fa274de1e support photo items between zot and zot6 2019-01-24 19:08:57 -08:00
zotlabs
1b5dd8bbd7 comment permission fix 2019-01-20 15:09:35 -08:00
zotlabs
52305ca91b more specific network checking in several places and remove some old debugging crud 2019-01-17 14:45:53 -08:00
zotlabs
96deae43fa this should fix the rest of the event stuff 2019-01-17 11:47:55 -08:00
zotlabs
b1b1e0eba4 channel connect issue 2019-01-17 10:47:04 -08:00
zotlabs
eda7c5369c event attendance testing continued (now works at a basic level from one direction, more testing needed) 2019-01-16 21:09:04 -08:00
zotlabs
e9f709301c more z6 event work 2019-01-16 17:32:16 -08:00
zotlabs
7e29bd10b6 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2019-01-16 16:52:21 -08:00
zotlabs
20eea2184b more work on z6 events 2019-01-16 16:50:44 -08:00
zotlabs
eaa375936f more z6 compatibility fixes 2019-01-16 15:28:30 -08:00
Mario Vavti
de8582ec07 Merge branch 'fix_dreport_issue' into dev 2019-01-16 21:52:16 +01:00
M. Dent
e6ccdc2378 Merge branch 'queue_fixes_1' into 'dev' 
do not return if delivery report could not bedecrypted

See merge request hubzilla/core!1475
 2019-01-16 15:58:13 +01:00
Mario Vavti
4450a01014 do not return if delivery report could not bedecrypted 2019-01-16 15:09:18 +01:00
Mario Vavti
a1ac507a94 change logic for consistency 2019-01-16 10:02:13 +01:00
Mario Vavti
ad6eb15eac fix legacy zot dreport not passing the is_storable check 2019-01-15 22:36:01 +01:00
Mario
2e94e4cd67 Merge branch 'core_fixes' into 'dev' 
Core fixes

See merge request hubzilla/core!1470
 2019-01-15 11:38:41 +01:00
Mario Vavti
c26e112bee whitespace 2019-01-14 15:06:21 +01:00
Mario Vavti
7daf18b077 fix a new instance of autocomplete created on each conversation update 2019-01-14 14:07:56 +01:00
Mario
a8a5d2fc4e Merge branch 'patch-20190113c' into 'dev' 
Hooks to allow addons to add "extras" to privacy group settings edit page.

See merge request hubzilla/core!1469
 2019-01-14 10:29:48 +01:00
Mario
90f6abfa7c Merge branch 'patch-20190113a' into 'dev' 
Add collect_public_recipients hook

See merge request hubzilla/core!1467
 2019-01-14 10:29:19 +01:00
Mario Vavti
65f2d7fd66 Merge branch 'dev' into core_fixes 2019-01-14 10:14:44 +01:00
Mario Vavti
f3554804bf only load new content onpopstate if the mid has actually changed 2019-01-14 10:14:37 +01:00
DM42.Net (Matt Dent)
f5e571ba40 Remove stray $ 2019-01-13 20:04:12 -05:00
DM42.Net (Matt Dent)
e43331b7a2 Add privacygroup_extras_post/drop hooks 2019-01-13 15:43:25 -05:00
Max Kostikov
e78fd09e07 Merge branch 'patch-20190113b' into 'dev' 
FIX: aggregated query error in MYSQL

See merge request hubzilla/core!1468
 2019-01-13 20:49:03 +01:00
DM42.Net (Matt Dent)
b4c1ca88f3 move order by and rewrite similar in update_queue_item() 2019-01-13 14:41:44 -05:00
DM42.Net (Matt Dent)
dba9c2fbb0 Add pgrp_extras hook & display 2019-01-13 14:34:04 -05:00
DM42.Net (Matt Dent)
ab074f52fe outq_created not outq_scheduled 2019-01-13 14:10:35 -05:00
DM42.Net (Matt Dent)
121fa834d5 FIX: aggregated query error in MYSQL 2019-01-13 14:06:36 -05:00
DM42.Net (Matt Dent)
598cbf2210 Add collect_public_recipients hook 2019-01-12 22:37:44 -05:00
Mario
9e42dfd094 Merge branch 'patch-20190111a' into 'dev' 
FIX: memory exhaustion on zot message pickup with large message queue

See merge request hubzilla/core!1466
 2019-01-12 09:22:37 +01:00
M. Dent
8aa117e4ae FIX: memory exhaustion on zot message pickup with large message queue 2019-01-12 09:22:37 +01:00
Mario
f6f4e40a64 Merge branch 'patch-20190110a' into 'dev' 
FIX: memory exhaustion on exceptionally large message queues & multiple...

See merge request hubzilla/core!1465
 2019-01-11 20:03:34 +01:00
DM42.Net (Matt Dent)
caf2c0a6c4 Use dba_driver.php::db_getfunc() 2019-01-11 07:35:12 -05:00
Mario Vavti
dc8da4717f Merge remote-tracking branch 'mike/master' into dev 2019-01-11 10:14:06 +01:00
zotlabs
7b30fc4b82 failure to import mail 2019-01-10 15:02:58 -08:00
DM42.Net (Matt Dent)
6791b05a40 Fix for PGSQL/MYSQL difference 2019-01-10 15:29:24 -05:00
ZotSocial Admin
b54ddccd7b FIX: memory exhaustion on exceptionally large message queues & multiple Queue.php invocations duplicate work 2019-01-10 13:15:00 -05:00
Max Kostikov
d32360cb3e Merge branch 'core_fixes' into 'dev' 
we must sslify all possible content variables

See merge request hubzilla/core!1464
 2019-01-10 14:12:16 +01:00
Mario Vavti
01f4ce96f1 do not count removed channels 2019-01-10 13:35:27 +01:00
Mario Vavti
90b6afe06b we must sslify all possible content variables 2019-01-10 00:29:05 +01:00
M. Dent
b22caef65f Merge branch 'composer_updates' into 'dev' 
update composer libs

See merge request hubzilla/core!1455
 2019-01-09 19:09:20 +01:00
M. Dent
db4281164c Merge branch 'core_gallery_05' into 'dev' 
core changes for gallery 05

See merge request hubzilla/core!1463
 2019-01-09 19:04:52 +01:00
Mario Vavti
217c2cacaf Merge branch 'dev' into core_gallery_05 2019-01-09 10:30:44 +01:00
Mario Vavti
df4b6f0376 Merge remote-tracking branch 'mike/master' into dev 2019-01-09 10:25:04 +01:00
Mario
6ec1bfebec Merge branch 'patch-20190106a' into 'dev' 
Remove Experimental Worker Queue from CORE - add hook 'daemon_master_release'

See merge request hubzilla/core!1461
 2019-01-09 10:16:53 +01:00
M. Dent
5d88326915 Remove Experimental Worker Queue from CORE - add hook 'daemon_master_release' 2019-01-09 10:16:53 +01:00
Mario
24354b9dcc Merge branch 'patch-20190107a' into 'dev' 
Tweak to deal with changes that may happen within the same second.

See merge request hubzilla/core!1462
 2019-01-09 10:16:05 +01:00
zotlabs
39de8e28da make Apps::get_base_apps() pluggable 2019-01-08 14:14:55 -08:00