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

	Commit message (Collapse)	Author	Age	Files	Lines
*	tagging changes: + (old style forum mentions), and underscore space ↵	zotlabs	2018-05-03	3	-121/+28
\| \| \| \|	replacement are no longer supported.
*	add changes from ae35ac0cec3f6bf337 to contact_autocomplete so channel ↵	zotlabs	2018-05-03	1	-2/+3
\| \| \| \|	source completion will work correctly
*	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2018-05-03	3	-2/+23
\|\
\| *	quick fix for issue #1150 - needs improvement and review of other ↵	Mario Vavti	2018-05-03	1	-2/+5
\| \| \| \| \| \| \| \|	textcomplete implementations.
\| *	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	Mario Vavti	2018-05-03	2	-0/+18
\| \|\
\| \| *	Merge pull request #1152 from dawnbreak/dev	git-marijus	2018-05-03	2	-0/+18
\| \| \|\ \| \| \| \| \| \| \| \|	Update composer autoload cache.
\| \| \| *	Update composer autoload cache.	Klaus Weidenbach	2018-05-02	2	-0/+18
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Should add to Prepare RC Release documentation: composer dump-autoload --no-dev
\| * \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2018-05-03	16	-53/+126
\| \|\ \ \| \| \|/ \| \|/\|
* \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2018-05-02	27	-1669/+2202
\|\\| \| \| \|/ \|/\|
\| *	Merge pull request #1146 from galettesaucisse/patch-46	git-marijus	2018-05-02	1	-0/+13
\| \|\ \| \| \| \| \| \|	Create /doc/context/fr/wiki/help.html
\| \| *	Create /doc/context/fr/wiki/help.html	Galette Saucisse	2018-04-30	1	-0/+13
\| \| \|
\| * \|	Merge pull request #1145 from galettesaucisse/patch-45	git-marijus	2018-05-02	1	-0/+8
\| \|\ \ \| \| \| \| \| \| \| \|	Create /doc/context/fr/webpages/help.html
\| \| * \|	Create /doc/context/fr/webpages/help.html	Galette Saucisse	2018-04-30	1	-0/+8
\| \| \| \|
\| * \| \|	Merge pull request #1144 from galettesaucisse/patch-44	git-marijus	2018-05-02	1	-0/+20
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Create /doc/context/fr/settings/tokens
\| \| * \| \|	Create /doc/context/fr/settings/tokens	Galette Saucisse	2018-04-30	1	-0/+20
\| \| \|/ /
\| * \| \|	Merge pull request #1143 from galettesaucisse/patch-43	git-marijus	2018-05-02	1	-0/+18
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Create /doc/context/fr/settings/channel/help.html
\| \| * \| \|	Create /doc/context/fr/settings/channel/help.html	Galette Saucisse	2018-04-30	1	-0/+18
\| \| \|/ /
\| * \| \|	Merge pull request #1142 from galettesaucisse/patch-42	git-marijus	2018-05-02	1	-0/+18
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Create /doc/context/fr/settings/account/help.html
\| \| * \| \|	Create /doc/context/fr/settings/account/help.html	Galette Saucisse	2018-04-30	1	-0/+18
\| \| \|/ /
\| * \| \|	Merge pull request #1141 from galettesaucisse/patch-40	git-marijus	2018-05-02	1	-0/+6
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Create /doc/context/fr/profile/help.html
\| \| * \| \|	Create /doc/context/fr/profile/help.html	Galette Saucisse	2018-04-30	1	-0/+6
\| \| \|/ /
\| * \| \|	Merge pull request #1140 from galettesaucisse/patch-39	git-marijus	2018-05-02	1	-0/+6
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Create /doc/context/photos/help.html
\| \| * \| \|	Create /doc/context/photos/help.html	Galette Saucisse	2018-04-30	1	-0/+6
\| \| \|/ /
\| * \| \|	Merge pull request #1139 from galettesaucisse/patch-38	git-marijus	2018-05-02	1	-0/+10
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Create /doc/context/fr/mail/help.html
\| \| * \| \|	Create /doc/context/fr/mail/help.html	Galette Saucisse	2018-04-30	1	-0/+10
\| \| \|/ /
\| * \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2018-05-02	9	-86/+114
\| \|\ \ \
\| * \| \| \|	Revert "Revert "hubzilla issue #1119 - xml2array has issues with some ↵	Mario Vavti	2018-05-01	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	unicode sequences/conversions. Working around it using the older simplexml parser until it can be debugged, as Diaspora does not use complex XML with namespaces; which is where we need the more advaced capabilities of xml2array."" This reverts commit b223e364c6221aa3c680505fda4acfd6a1790272.
\| * \| \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2018-05-01	2	-62/+47
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	activitypub xchans do not have an xchan_addr. use xchan_url for the follow ↵	Mario Vavti	2018-04-30	1	-1/+1
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	button if we do not find an xchan_addr
\| * \| \|	fix another pgsql update error	Mario	2018-04-30	1	-1/+1
\| \| \| \|
\| * \| \|	Revert "hubzilla issue #1119 - xml2array has issues with some unicode ↵	Mario Vavti	2018-04-30	1	-11/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sequences/conversions. Working around it using the older simplexml parser until it can be debugged, as Diaspora does not use complex XML with namespaces; which is where we need the more advaced capabilities of xml2array." This reverts commit f620274c6a68ae9a2a6a5142947aa199862087fc.
\| * \| \|	Merge pull request #1138 from galettesaucisse/patch-37	git-marijus	2018-04-30	1	-0/+8
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Create /doc/context/fr/events/help.html
\| \| * \| \|	Create /doc/context/fr/events/help.html	Galette Saucisse	2018-04-30	1	-0/+8
\| \| \| \| \|
\| * \| \| \|	Merge pull request #1137 from galettesaucisse/patch-36	git-marijus	2018-04-30	1	-0/+13
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Create /doc/context/fr/connedit/help.html
\| \| * \| \| \|	Create /doc/context/fr/connedit/help.html	Galette Saucisse	2018-04-30	1	-0/+13
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #1136 from galettesaucisse/patch-35	git-marijus	2018-04-30	1	-0/+8
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create /doc/context/fr/connections/ifpending/help.html
\| \| * \| \| \| \|	Create /doc/context/fr/connections/ifpending/help.html	Galette Saucisse	2018-04-30	1	-0/+8
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #1135 from galettesaucisse/patch-34	git-marijus	2018-04-30	1	-0/+8
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create /doc/context/fr/connections/help.html
\| \| * \| \| \| \| \|	Create /doc/context/fr/connections/help.html	Galette Saucisse	2018-04-30	1	-0/+8
\| \| \|/ / / / /
\| * \| \| \| \| \|	Merge pull request #1134 from galettesaucisse/patch-33	git-marijus	2018-04-30	1	-0/+7
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create /doc/context/fr/cloud/help.html
\| \| * \| \| \| \| \|	Create /doc/context/fr/cloud/help.html	Galette Saucisse	2018-04-30	1	-0/+7
\| \| \|/ / / / /
\| * \| \| \| \| \|	Merge pull request #1133 from HappyPony/patch-1	git-marijus	2018-04-30	1	-0/+16
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Russian translation for cards
\| \| * \| \| \| \| \|	Russian translation for cards	HappyPony	2018-04-30	1	-0/+16
\| \| \|/ / / / /
\| * \| \| \| \| \|	Merge pull request #1127 from galettesaucisse/patch-26	git-marijus	2018-04-30	1	-0/+8
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create /doc/context/fr/chat/help.html
\| \| * \| \| \| \| \|	Create /doc/context/fr/chat/help.html	Galette Saucisse	2018-04-29	1	-0/+8
\| \| \|/ / / / /
\| * \| \| \| \| \|	Merge pull request #1126 from galettesaucisse/patch-25	git-marijus	2018-04-30	1	-0/+20
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create /doc/context/fr/cards/help.html
\| \| * \| \| \| \| \|	Create /doc/context/fr/cards/help.html	Galette Saucisse	2018-04-29	1	-0/+20
\| \| \|/ / / / /
\| * \| \| \| \| \|	Merge pull request #1125 from galettesaucisse/patch-24	git-marijus	2018-04-30	1	-0/+4
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create /doc/context/fr/apps/edit/help.html
\| \| * \| \| \| \| \|	Create /doc/context/fr/apps/edit/help.html	Galette Saucisse	2018-04-29	1	-0/+4
\| \| \|/ / / / /
\| * \| \| \| \| \|	Merge pull request #1124 from galettesaucisse/patch-23	git-marijus	2018-04-30	1	-0/+5
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create /doc/context/fr/appman/help.html