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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\|\
\| *	parent folder permissions weren't being checked back to the cloud root ↵	zotlabs	2018-04-30	2	-62/+47
\| \| \| \| \| \| \| \|	directory in all cases
* \|	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
\| * \| \| \| \|	Create /doc/context/fr/appman/help.html	Galette Saucisse	2018-04-29	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Create /doc/context/fr/appman/help.html	Galette Saucisse	2018-04-29	1	-0/+5
\| \|/ / / /
* \| \| \| \|	Merge pull request #1123 from galettesaucisse/patch-22	git-marijus	2018-04-30	1	-0/+7
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|	Create /doc/context/fr/apps/help.html
\| * \| \| \|	Create /doc/context/fr/apps/help.html	Galette Saucisse	2018-04-29	1	-0/+7
\| \|/ / /
* \| / /	missing class	Mario Vavti	2018-04-30	1	-1/+1
\| \|/ / \|/\| \|
* \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2018-04-30	4	-27/+15
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	hubzilla issue #1119 - xml2array has issues with some unicode ↵	zotlabs	2018-04-29	1	-0/+11
\| \| \| \| \| \| \| \|	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.
\| *	Update issues on postgres	zotlabs	2018-04-29	3	-3/+3
\| \|
\| *	remove unused function	zotlabs	2018-04-28	1	-24/+1
\| \|
* \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2018-04-27	1	-1/+1
\|\\|
\| *	sql error	zotlabs	2018-04-27	1	-1/+1
\| \|
\| *	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2018-04-26	11	-1514/+2498
\| \|\
* \| \	Merge pull request #1120 from phellmes/dev	git-marijus	2018-04-27	2	-1553/+1856
\|\ \ \ \| \| \| \| \| \| \| \|	Update DE translation strings
\| * \| \|	Update DE translation strings	phellmes	2018-04-26	2	-1553/+1856
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	German strings for development branch and release candidate 3.4
* \| \| \|	Merge pull request #1117 from galettesaucisse/patch-19	git-marijus	2018-04-27	1	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Update FR toc.html
\| * \| \| \|	Update FR toc.html	Galette Saucisse	2018-04-25	1	-3/+3
\| \| \| \| \|
* \| \| \| \|	Merge pull request #1116 from galettesaucisse/patch-18	git-marijus	2018-04-27	1	-179/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Delete FR project.bb from wrong folder
\| * \| \| \| \|	Delete FR project.bb from wrong folder	Galette Saucisse	2018-04-25	1	-179/+0
\| \|/ / / / \| \| \| \| \| \| \| \| \| \|	apologies
* \| \| \| \|	Merge pull request #1115 from galettesaucisse/patch-17	git-marijus	2018-04-27	1	-0/+174
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update project.bb and place in correct folder
\| * \| \| \| \|	Update project.bb	Galette Saucisse	2018-04-25	1	-7/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Update project.bb and place in correct folder	Galette Saucisse	2018-04-25	1	-0/+175
\| \|/ / / / \| \| \| \| \| \| \| \| \| \|	FR toc.html needs editing
* \| \| \| \|	Merge pull request #1113 from mjfriaza/dev	git-marijus	2018-04-27	1	-77/+109
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	New strings: Spanish translation
\| * \| \| \| \|	New strings: Spanish translation	mjfriaza	2018-04-25	1	-77/+109
\| \| \| \| \| \|
* \| \| \| \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2018-04-27	5	-63/+89
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| / \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	where possible strip zid parameter from links that get pasted into posts so ↵	zotlabs	2018-04-26	3	-5/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	that they will get a correct zid when rendered