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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge	zotlabs	2018-07-30	2	-9/+14
\|\
\| *	Merge branch 'patch-13' into 'dev'	Mario	2018-07-30	1	-8/+13
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Workaround on possible error with php2po See merge request hubzilla/core!1247
\| \| *	Workaround on possible error	Max Kostikov	2018-07-29	1	-5/+6
\| \| \|
\| \| *	Update php2po.php	Max Kostikov	2018-07-29	1	-2/+3
\| \| \|
\| \| *	Workaround on possible error	Max Kostikov	2018-07-29	1	-2/+5
\| \| \|
\| * \|	Update network.php	gia vec	2018-07-30	1	-1/+1
\| \|/ \| \| \| \|	(cherry picked from commit 8db006d9a1b3401f79ad0458e3a2ebae64c3575c)
* \|	When checking permissions ignore checking site "Block Public" settings in ↵	zotlabs	2018-07-30	5	-12/+16
\| \| \| \| \| \| \| \|	cases where site permissions aren't applicable
* \|	Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge	zotlabs	2018-07-29	9	-85/+99
\|\\|
\| *	fix sql empty query error in db update 1216	Mario Vavti	2018-07-29	1	-1/+1
\| \|
\| *	Merge branch 'patch-12' into 'dev'	Mario	2018-07-29	1	-9/+15
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Process msgctxt plurals See merge request hubzilla/core!1246
\| \| *	Process msgctxt plurals	Max Kostikov	2018-07-29	1	-9/+15
\| \| \|
\| * \|	version	Mario Vavti	2018-07-29	1	-1/+1
\| \| \|
\| * \|	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	Mario Vavti	2018-07-29	8	-84/+92
\| \|\\|
\| \| *	Merge branch 'patch-11' into 'dev'	Mario	2018-07-28	1	-59/+62
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Plural form strings export added See merge request hubzilla/core!1245
\| \| \| *	Plural form strings export added	Max Kostikov	2018-07-28	1	-59/+62
\| \| \| \|
\| \| * \|	Merge branch 'patch-9' into 'dev'	Mario	2018-07-28	1	-3/+3
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Respect navbar translations See merge request hubzilla/core!1243
\| \| \| * \|	Update nav.php	Max Kostikov	2018-07-27	1	-3/+3
\| \| \| \| \|
\| \| * \| \|	Merge branch 'patch-8' into 'dev'	Mario	2018-07-28	1	-1/+5
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix navbar missed translations See merge request hubzilla/core!1242
\| \| \| * \| \|	Update Apps.php	Max Kostikov	2018-07-27	1	-3/+4
\| \| \| \| \| \|
\| \| \| * \| \|	Update Apps.php	Max Kostikov	2018-07-27	1	-1/+4
\| \| \| \|/ /
\| \| * \| \|	Merge branch 'patch-7' into 'dev'	Mario	2018-07-28	4	-20/+21
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Russian translation update See merge request hubzilla/core!1241
\| \| \| * \| \|	Update hstrings.php	Max Kostikov	2018-07-26	1	-9/+9
\| \| \| \| \| \|
\| \| \| * \| \|	Update hmessages.po	Max Kostikov	2018-07-26	1	-9/+10
\| \| \| \| \| \|
\| \| \| * \| \|	Update passchanged_eml.tpl	Max Kostikov	2018-07-26	1	-1/+1
\| \| \| \| \| \|
\| \| \| * \| \|	Update lostpass_eml.tpl	Max Kostikov	2018-07-26	1	-1/+1
\| \| \| \|/ /
\| \| * \| \|	Merge branch 'patch-6' into 'dev'	Mario	2018-07-28	1	-1/+1
\| \| \|\ \ \ \| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	Fix duplicate transport displaying See merge request hubzilla/core!1240
\| \| \| * \|	Fix duplicate transport displaying	kostikov	2018-07-25	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	wrong class name	Mario Vavti	2018-07-29	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2018-07-29	3	-9/+28
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2018-07-28	1	-26/+98
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	this may conflict	zotlabs	2018-07-29	2	-16/+17
\| \|_\|/ / \|/\| \| \|
* \| \| \|	fix unsanitised xchan_name	zotlabs	2018-07-28	2	-1/+20
\| \| \| \|
* \| \| \|	SECURITY: sanitise vcard fields	zotlabs	2018-07-28	1	-8/+8
\| \| \| \|
* \| \| \|	Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge	zotlabs	2018-07-27	13	-7203/+15914
\|\\| \| \| \| \|/ / \|/\| \|
\| * \|	fix sql error	Mario Vavti	2018-07-26	1	-1/+1
\| \|/
\| *	Merge branch 'patch-4' into 'dev'	Mario	2018-07-23	0	-0/+0
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Update hmessages.po See merge request hubzilla/core!1238
\| \| *	Update hmessages.po	kostikov	2018-07-23	1	-183/+171
\| \| \|
\| * \|	Merge branch 'patch-5' into 'dev'	Mario	2018-07-23	0	-0/+0
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update hstrings.php See merge request hubzilla/core!1239
\| \| * \|	Update hstrings.php	kostikov	2018-07-23	1	-75/+94
\| \| \|/
\| * \|	Merge branch 'patch-2' into 'dev'	Mario	2018-07-23	3	-261/+268
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	Escape internal quotes in translation on export See merge request hubzilla/core!1237
\| \| *	Update hstrings.php	kostikov	2018-07-23	1	-75/+94
\| \| \|
\| \| *	Update hmessages.po	kostikov	2018-07-23	1	-183/+171
\| \| \|
\| \| *	Escape internal quotes in translation on export	kostikov	2018-07-22	1	-3/+3
\| \|/
\| *	update changelog	Mario Vavti	2018-07-21	1	-0/+94
\| \|
\| *	Merge branch 'patch-2' into 'dev'	Mario	2018-07-21	7	-65/+118
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	New russian templates See merge request hubzilla/core!1233
\| \| *	Update update_fail_eml.tpl	kostikov	2018-07-20	1	-13/+14
\| \| \|
\| \| *	Create register_verify_member.tpl	kostikov	2018-07-20	1	-0/+34
\| \| \|
\| \| *	Update register_verify_eml.tpl	kostikov	2018-07-20	1	-10/+9
\| \| \|
\| \| *	Update register_open_eml.tpl	kostikov	2018-07-20	1	-14/+12
\| \| \|
\| \| *	Update passchanged_eml.tpl	kostikov	2018-07-20	1	-11/+15
\| \| \|