volse-hubzilla.git - Volse Hubzilla -- soft fork of main Hubzilla core for Volse

	Commit message (Collapse)	Author	Age	Files	Lines
*	backslash	Mario Vavti	2019-03-29	1	-1/+1
\|
*	missing use declaration	Mario Vavti	2019-03-29	1	-0/+2
\|
*	Merge branch 'z6_discover_fixes' into 'dev'	Max Kostikov	2019-03-29	2	-5/+39
\|\ \| \| \| \| \| \| \| \|	fix various issues in z6_discover() and add zot6 hubloc creation on channel import See merge request hubzilla/core!1575
\| *	fix typo	Mario Vavti	2019-03-28	1	-2/+2
\| \|
\| *	another fix for z6_discover() and create a zot6 hubloc if applicable	Mario Vavti	2019-03-28	2	-2/+34
\| \|
\| *	fix various issues in z6_discover()	Mario Vavti	2019-03-27	1	-3/+5
\| \|
* \|	Fix wrong bracket	Max Kostikov	2019-03-27	1	-2/+2
\| \|
* \|	Merge branch 'dev' into 'dev'	Max Kostikov	2019-03-27	1	-2/+2
\|\ \ \| \|/ \|/\| \| \| \| \|	Fix wrong permissions on attached images in personal messages See merge request hubzilla/core!1574
\| *	Fix wrong permissions on attached images in personal messages	Max Kostikov	2019-03-27	1	-2/+2
\|/
*	Merge branch 'duplicate_fixes_1' into 'dev'	Max Kostikov	2019-03-25	1	-5/+15
\|\ \| \| \| \| \| \| \| \|	if we have an uuid deduplicate by uuid otherwise by mid See merge request hubzilla/core!1573
\| *	if we have an uuid deduplicate by uuid otherwise by mid	Mario Vavti	2019-03-25	1	-5/+15
\| \|
* \|	Merge branch 'patch-20190324a' into 'dev'	Mario	2019-03-25	1	-0/+5
\|\ \ \| \|/ \|/\| \| \| \| \|	Add ITEM_TYPE_CUSTOM support to Zotlabs/Module/Display.php See merge request hubzilla/core!1572
\| *	Add ITEM_TYPE_CUSTOM support to Zotlabs/Module/Display.php	DM42.Net (Matt Dent)	2019-03-24	1	-0/+5
\|/
*	fix wrong field name	Mario Vavti	2019-03-24	1	-2/+2
\|
*	Revert "item_store(): deduplicate by mid OR uuid"	Mario Vavti	2019-03-24	1	-2/+1
\| \| \| \|	This reverts commit d8ce0d0df0b7b58b3f2a1abfc26f455fb943f8ea.
*	Merge branch 'items_fixes' into 'dev'	Max Kostikov	2019-03-24	1	-1/+2
\|\ \| \| \| \| \| \| \| \|	item_store(): deduplicate by mid OR uuid possible fix for #1349 See merge request hubzilla/core!1570
\| *	item_store(): deduplicate by mid OR uuid	Mario Vavti	2019-03-24	1	-1/+2
\|/
*	Merge branch 'core_fixes' into 'dev'	M. Dent	2019-03-24	9	-14/+14
\|\ \| \| \| \| \| \| \| \|	Core fixes See merge request hubzilla/core!1569
\| *	add punify() again	Mario	2019-03-23	1	-2/+2
\| \|
\| *	fix typo	Mario	2019-03-23	1	-1/+1
\| \|
\| *	fix subthread on sys channel items	Mario	2019-03-23	1	-1/+1
\| \|
\| *	fix revert accidental moving of Features.php	Mario	2019-03-23	3	-105/+105
\| \|
\| *	aparently we do not use underscores anymore. this fixes spaming of dreports ↵	Mario	2019-03-23	1	-1/+1
\| \| \| \| \| \| \| \|	with recipient not found entries for our own xchan
\| *	fix variables for xporof_locale and xprof_postcode	Mario	2019-03-23	1	-4/+4
\| \|
\| *	revert accidental moving of Features.php	Mario	2019-03-23	1	-0/+0
\| \|
\| *	fix 48 hours timeframe check and remove unused var in mod changeaddr	Mario	2019-03-23	2	-2/+2
\| \|
\| *	revert accidental moving of Enotify.php	Mario	2019-03-23	1	-0/+0
\| \|
\| *	fix typo	Mario	2019-03-23	2	-1/+1
\| \|
\| *	fix wrong variable in unused function	Mario	2019-03-23	1	-1/+1
\| \|
\| *	Webfinger::zot_url() requires a string (webfinger address), empty var given ↵	Mario	2019-03-23	1	-1/+1
\| \| \| \| \| \| \| \|	in update_directory_entry()
\| *	db_columns() requires a string, empty var given in ↵	Mario	2019-03-23	1	-1/+1
\|/ \| \| \|	process_channel_sync_delivery()
*	bump version	Mario Vavti	2019-03-21	1	-1/+1
\|
*	optimize autoload cache and update changelog	Mario Vavti	2019-03-21	3	-6/+32
\|
*	Merge branch 'dev' into 'dev'	Mario	2019-03-21	1	-0/+1
\|\ \| \| \| \| \| \| \| \|	hubzilla core issue #1356 , permissions not getting decrypted on follow See merge request hubzilla/core!1563
\| *	hubzilla core issue #1356 , permissions not getting decrypted on follow	zotlabs	2019-03-20	1	-0/+1
\| \|
* \|	another whitespace to trigger tests	Mario Vavti	2019-03-21	1	-1/+0
\| \|
* \|	just whitespace to trigger a new build test	Mario Vavti	2019-03-20	1	-1/+0
\| \|
* \|	Merge branch 'video' into 'dev'	M. Dent	2019-03-20	1	-0/+22
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Video See merge request hubzilla/core!1561
\| * \|	Video	Mario	2019-03-20	1	-0/+22
\|/ /
* \|	Merge branch 'update_1231' into 'dev'	Max Kostikov	2019-03-19	4	-25/+89
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	mysql: remove some unused indices and add thr_parent index. pgsql: sync... See merge request hubzilla/core!1560
\| * \|	mysql: remove some unused indices and add thr_parent index. pgsql: sync ↵	Mario Vavti	2019-03-19	4	-25/+89
\|/ / \| \| \| \| \| \|	indices with mysql indices after testing on hub.disroot.org and add thr_parent
* \|	Merge branch 'dev' into 'dev'	Mario	2019-03-19	3	-3/+25
\|\\| \| \| \| \| \| \| \| \|	messagefilter enhancements and fix for advisory permissions edge case See merge request hubzilla/core!1559
\| *	Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev	zotlabs	2019-03-18	13	-23/+192
\| \|\
\| \| *	Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev	Mike Macgirvin	2019-03-19	2	-3/+21
\| \| \|\
\| \| * \	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	Mike Macgirvin	2019-03-19	4	-2/+171
\| \| \|\ \ \| \|_\|/ / \|/\| \| \|
* \| \| \|	Merge branch 'dev' into 'dev'	M. Dent	2019-03-19	4	-2/+171
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	composer: add phpmd and phpcs to require-dev See merge request hubzilla/core!1557
\| * \| \| \|	add phpmd and phpcs to require-dev	Mario	2019-03-17	4	-2/+171
\| \| \| \| \|
\| \| \| * \|	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	Mike Macgirvin	2019-03-19	9	-21/+21
\| \| \| \|\ \ \| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	fix typos	Mario Vavti	2019-03-18	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	some more xss prevention	Mario Vavti	2019-03-18	5	-16/+16
\| \| \| \| \|