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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \|	Merge branch 'dev' into 'dev'	Mario	2019-01-23	1	-0/+3
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| / / / \| \| \| \|/ / / \| \| \|/\| \| \|	Skip tags detection in URL See merge request hubzilla/core!1482
\| \| * \| \| \|	Skip tags detection in URL	Max Kostikov	2019-01-22	1	-0/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'embedphotos' into 'dev'	Mario	2019-01-22	1	-53/+69
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Try to fix some warnings in Zotlabs\Module\Embedphotos. See merge request hubzilla/core!1481
\| \| * \| \| \| \|	Try to fix some warnings in Zotlabs\Module\Embedphotos.	Klaus Weidenbach	2019-01-22	1	-53/+69
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	$phototypes was undefined, hope this is correct selection to fix it. Correct Doxygen and clean up some variables and refactoring.
\| * \| \| \| \| \|	Merge branch 'patch-20190114a' into 'dev'	Mario	2019-01-22	2	-2/+10
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add remaining hook insertions See merge request hubzilla/core!1471
\| \| * \| \| \| \| \|	Add remaining hook insertions	M. Dent	2019-01-22	2	-2/+10
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	Mario Vavti	2019-01-21	2	-50/+48
\| \|\\| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'dev' into 'dev'	M. Dent	2019-01-19	1	-14/+12
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some fixes in include/help.php. See merge request hubzilla/core!1479
\| \| \| * \| \| \| \|	Some fixes in include/help.php.	Klaus Weidenbach	2019-01-18	1	-14/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused variables and a wrong function name.
\| \| * \| \| \| \| \|	Merge branch 'bugfix-plugin' into 'dev'	M. Dent	2019-01-19	1	-36/+36
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wrong variable name in include/plugin.php. See merge request hubzilla/core!1480
\| \| \| * \| \| \| \|	Fix wrong variable name in include/plugin.php.	Klaus Weidenbach	2019-01-19	1	-36/+36
\| \| \|/ / / / /
\| * \| \| \| \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2019-01-21	1	-1/+1
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2019-01-18	2	-15/+26
\| \|\ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'QA' into 'dev'	Mario	2019-01-18	2	-22/+58
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add PostgreSQL to gitlab-ci setup. See merge request hubzilla/core!1478
\| \| * \| \| \| \| \| \|	Add PostgreSQL to gitlab-ci setup.	Klaus Weidenbach	2019-01-17	2	-22/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Run our tests against a PostgreSQL again.
\| * \| \| \| \| \| \| \|	Merge branch 'dreport_fixes' into 'dev'	M. Dent	2019-01-18	3	-2/+8
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix delivery report for zot6 connections See merge request hubzilla/core!1476
\| \| * \| \| \| \| \| \| \|	add space	Mario Vavti	2019-01-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	fix delivery report for zot6 connections	Mario Vavti	2019-01-17	3	-2/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'core_fixes' into 'dev'	M. Dent	2019-01-18	1	-0/+3
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	possible fix for #1326 See merge request hubzilla/core!1477
\| \| * \| \| \| \| \| \| \|	possible fix for #1326	Mario Vavti	2019-01-17	1	-0/+3
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| /	block private reshares from zot6 due to different parents	zotlabs	2019-01-28	1	-0/+11
\| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	share fixes	zotlabs	2019-01-27	2	-0/+6
\| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	cleanup of cli admin tool	zotlabs	2019-01-26	1	-5/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	command line tool for managing site admins	zotlabs	2019-01-26	1	-0/+64
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
* \| \| \| \| \|	support photo items between zot and zot6	zotlabs	2019-01-24	2	-1/+37
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	comment permission fix	zotlabs	2019-01-20	1	-1/+1
\| \|_\|/ / \|/\| \| \|
* \| \| \|	more specific network checking in several places and remove some old ↵	zotlabs	2019-01-17	1	-11/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	debugging crud
* \| \| \|	this should fix the rest of the event stuff	zotlabs	2019-01-17	1	-4/+13
\|/ / /
* / /	channel connect issue	zotlabs	2019-01-17	1	-1/+1
\|/ /
* \|	event attendance testing continued (now works at a basic level from one ↵	zotlabs	2019-01-16	1	-1/+1
\| \| \| \| \| \| \| \|	direction, more testing needed)
* \|	more z6 event work	zotlabs	2019-01-16	1	-1/+27
\| \|
* \|	Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge	zotlabs	2019-01-16	56	-477/+725
\|\ \
\| * \	Merge branch 'fix_dreport_issue' into dev	Mario Vavti	2019-01-16	2	-2/+19
\| \|\ \
\| \| * \|	change logic for consistency	Mario Vavti	2019-01-16	1	-3/+6
\| \| \| \|
\| \| * \|	fix legacy zot dreport not passing the is_storable check	Mario Vavti	2019-01-15	3	-2/+25
\| \| \| \|
\| * \| \|	Merge branch 'queue_fixes_1' into 'dev'	M. Dent	2019-01-16	1	-17/+32
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	do not return if delivery report could not bedecrypted See merge request hubzilla/core!1475
\| \| * \|	do not return if delivery report could not bedecrypted	Mario Vavti	2019-01-16	1	-17/+32
\| \|/ /
\| * \|	Merge branch 'core_fixes' into 'dev'	Mario	2019-01-15	3	-8/+12
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Core fixes See merge request hubzilla/core!1470
\| \| * \|	whitespace	Mario Vavti	2019-01-14	1	-2/+0
\| \| \| \|
\| \| * \|	fix a new instance of autocomplete created on each conversation update	Mario Vavti	2019-01-14	1	-5/+11
\| \| \| \|
\| \| * \|	Merge branch 'dev' into core_fixes	Mario Vavti	2019-01-14	5	-10/+36
\| \| \|\ \
\| \| * \| \|	only load new content onpopstate if the mid has actually changed	Mario Vavti	2019-01-14	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'patch-20190113c' into 'dev'	Mario	2019-01-14	6	-1/+57
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hooks to allow addons to add "extras" to privacy group settings edit page. See merge request hubzilla/core!1469
\| \| * \| \| \|	Remove stray $	DM42.Net (Matt Dent)	2019-01-13	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Add privacygroup_extras_post/drop hooks	DM42.Net (Matt Dent)	2019-01-13	5	-1/+51
\| \| \| \| \| \|
\| \| * \| \| \|	Add pgrp_extras hook & display	DM42.Net (Matt Dent)	2019-01-13	2	-0/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'patch-20190113a' into 'dev'	Mario	2019-01-14	3	-2/+62
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add collect_public_recipients hook See merge request hubzilla/core!1467
\| \| * \| \| \|	Add collect_public_recipients hook	DM42.Net (Matt Dent)	2019-01-12	3	-2/+62
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'patch-20190113b' into 'dev'	Max Kostikov	2019-01-13	2	-3/+3
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	FIX: aggregated query error in MYSQL See merge request hubzilla/core!1468
\| \| * \| \| \|	move order by and rewrite similar in update_queue_item()	DM42.Net (Matt Dent)	2019-01-13	2	-3/+3
\| \| \| \| \| \|