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'	Max Kostikov	2019-08-23	2	-2/+2
\|\ \| \| \| \| \| \| \| \|	issues with image import to zot6 - wrong mid. Also label source project of... See merge request hubzilla/core!1717
\| *	issues with image import to zot6 - wrong mid. Also label source project of ↵	zotlabs	2019-08-22	2	-2/+2
\|/ \| \| \|	zotfeed since it is not completely compatible across projects.
*	Merge branch 'dev' into 'dev'	Max Kostikov	2019-08-22	2	-2/+2
\|\ \| \| \| \| \| \| \| \|	possible for DB to return hublocs with no sitekey See merge request hubzilla/core!1713
\| *	Merge branch 'dev' of https://framagit.org/zot/core into dev	zotlabs	2019-08-21	12	-553/+591
\| \|\
\| * \|	possible for DB to return hublocs with no sitekey	zotlabs	2019-08-21	2	-2/+2
\| \| \|
* \| \|	Merge branch 'dev' into 'dev'	Max Kostikov	2019-08-22	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix attach permissions sync for clonned channel See merge request hubzilla/core!1716
\| * \| \|	Fix attach permissions sync for clonned channel	Max Kostikov	2019-08-22	1	-2/+2
\| \| \| \|
* \| \| \|	Merge branch 'dev' into 'dev'	Max Kostikov	2019-08-22	1	-0/+3
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix spoiler displaying while convert BBcode to markdown See merge request hubzilla/core!1715
\| * \| \|	Fix spoiler displaying while convert BBcode to markdown	Max Kostikov	2019-08-22	1	-0/+3
\|/ / /
* \| \|	update changelog	Mario Vavti	2019-08-16	1	-0/+6
\| \| \|
* \| \|	Merge branch 'dev' into 'dev'	Mario	2019-08-16	12	-553/+591
\|\ \ \ \| \|/ / \|/\| / \| \|/ \| \|	zot6 compatibility: when posting from a non-primary clone the actor->id is... See merge request hubzilla/core!1710
\| *	support "bearcaps" in Activity library	zotlabs	2019-08-15	1	-0/+19
\| \|
\| *	show correct profile photo when previewing and editing profiles	zotlabs	2019-08-15	1	-1/+9
\| \|
\| *	fix bitrot in util/zotsh	zotlabs	2019-08-15	10	-551/+546
\| \|
\| *	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	zotlabs	2019-08-15	0	-0/+0
\| \|\ \| \|/ \|/\|
* \|	Merge branch 'dev' into 'dev'	Max Kostikov	2019-08-14	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	illegal offset warning (prevents encrypted signatures from being used for... See merge request hubzilla/core!1709
\| \| *	zot6 compatibility: when posting from a non-primary clone the actor->id is ↵	zotlabs	2019-08-14	1	-1/+17
\| \|/ \| \| \| \| \| \|	that of the primary, resulting in an author/owner identity mismatch. Solution is to always post with the actor->id set to the sender if it is a local channel.
\| *	illegal offset warning (prevents encrypted signatures from being used for ↵	zotlabs	2019-08-13	1	-1/+1
\|/ \| \| \|	encrypted messages). Not fatal but can leak metadata.
*	update changelog	Mario Vavti	2019-08-13	1	-1/+3
\|
*	update directory servers	Mario Vavti	2019-08-13	1	-3/+3
\|
*	Merge branch 'dev_homeinstall_debian10' into 'dev'	Mario	2019-08-13	2	-111/+52
\|\ \| \| \| \| \| \| \| \|	Changes: Debian 10, MariaDB, adminer See merge request hubzilla/core!1707
\| *	Changes: Debian 10, MariaDB, adminer	OJ Random	2019-08-12	2	-111/+52
\| \|
* \|	Merge branch 'rudocs' into 'dev'	Max Kostikov	2019-08-12	3	-4/+10
\|\ \ \| \|/ \|/\| \| \| \| \|	Add more Russian context help See merge request hubzilla/core!1708
\| *	Merge branch 'dev' into 'rudocs'	Max Kostikov	2019-08-12	0	-0/+0
\| \|\ \| \|/ \|/\| \| \|	# Conflicts: # doc/context/ru/network/help.html
* \|	Update help.html	Max Kostikov	2019-08-12	1	-1/+1
\| \|
* \|	Update help.html	Max Kostikov	2019-08-12	1	-1/+1
\| \|
* \|	Merge branch 'rudocs' into 'dev'	Max Kostikov	2019-08-12	4	-55/+65
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add Russian context help and update translation See merge request hubzilla/core!1706
\| \| *	Delete .gitkeep	Max Kostikov	2019-08-12	1	-0/+0
\| \| \|
\| \| *	Delete .gitkeep	Max Kostikov	2019-08-12	1	-0/+0
\| \| \|
\| \| *	Update help.html	Max Kostikov	2019-08-12	1	-1/+1
\| \| \|
\| \| *	Update help.html	Max Kostikov	2019-08-12	1	-1/+0
\| \| \|
\| \| *	Update help.html	Max Kostikov	2019-08-12	1	-4/+3
\| \| \|
\| \| *	Add Russian context help for Connections	Max Kostikov	2019-08-12	1	-0/+8
\| \| \|
\| \| *	Add new directory	Max Kostikov	2019-08-12	1	-0/+0
\| \| \|
\| \| *	Update help.html	Max Kostikov	2019-08-12	1	-1/+1
\| \| \|
\| \| *	Update help.html	Max Kostikov	2019-08-12	1	-1/+1
\| \|/
\| *	Update help.html	Max Kostikov	2019-08-12	1	-1/+1
\| \|
\| *	Update help.html	Max Kostikov	2019-08-12	1	-2/+2
\| \|
\| *	Update hstrings.php	Max Kostikov	2019-08-12	1	-27/+27
\| \|
\| *	Update hmessages.po	Max Kostikov	2019-08-12	1	-28/+28
\| \|
\| *	Add Russian context help for network page	Max Kostikov	2019-08-12	1	-0/+10
\| \|
\| *	Add new directory	Max Kostikov	2019-08-12	1	-0/+0
\|/
*	Merge branch 'dev' into 'dev'	Max Kostikov	2019-08-12	2	-488/+511
\|\ \| \| \| \| \| \| \| \|	Updated Spanish translation See merge request hubzilla/core!1705
\| *	Updated Spanish translation	Manuel Jiménez Friaza	2019-08-11	2	-488/+511
\| \|
\| *	Merge remote-tracking branch 'upstream/dev' into dev	Manuel Jiménez Friaza	2019-08-11	114	-47354/+31617
\| \|\
\| * \|	Updated Spanish translation	Manuel Jiménez Friaza	2019-05-19	3	-1307/+1485
\| \| \|
\| * \|	Merge remote-tracking branch 'upstream/dev' into dev	Manuel Jiménez Friaza	2019-05-19	845	-45775/+78694
\| \|\ \
\| * \| \|	Quickfix es-es/hstrings.php	Manuel Jiménez Friaza	2019-02-21	1	-1/+1
\| \| \| \|
\| * \| \|	Fix es-es/hstrings.php	Manuel Jiménez Friaza	2019-02-21	1	-1/+1
\| \| \| \|
\| * \| \|	Update Spanish translation	Manuel Jiménez Friaza	2019-02-21	2	-1646/+1994
\| \| \| \|