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	2019-01-28	27	-1148/+1486
\|\
\| *	Merge branch 'core_fixes' into 'dev'	M. Dent	2019-01-28	2	-1/+6
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	update nginx and lighttpd sample server configs to explicit dissalow access to util See merge request hubzilla/core!1493
\| \| *	update nginx and lighttpd sample server configs to explicit dissalow access ↵	Mario Vavti	2019-01-27	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \|	to util
\| * \|	Merge branch 'patch-20190125a' into 'dev'	Mario	2019-01-27	1	-12/+2
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	Remove extraneous sync logic See merge request hubzilla/core!1490
\| \| *	Remove extraneous sync logic	M. Dent	2019-01-27	1	-12/+2
\| \|/
\| *	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2019-01-27	1	-0/+60
\| \|\
\| * \	Merge branch 'core_fixes' into 'dev'	M. Dent	2019-01-26	1	-2/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	return false if http signatue is not valid See merge request hubzilla/core!1489
\| \| * \|	return false if http signatue is not valid	Mario Vavti	2019-01-25	1	-2/+1
\| \| \| \|
\| * \| \|	Merge branch 'dev' into 'dev'	Max Kostikov	2019-01-25	2	-701/+862
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Russian translation See merge request hubzilla/core!1491
\| \| * \| \|	Update hstrings.php	Max Kostikov	2019-01-25	1	-8/+37
\| \| \| \| \|
\| \| * \| \|	Update hmessages.po	Max Kostikov	2019-01-25	1	-693/+825
\| \| \| \| \|
\| * \| \| \|	bump version	Mario Vavti	2019-01-25	1	-1/+1
\| \| \|/ / \| \|/\| \|
\| * \| \|	Merge branch 'apidocpublishing' into 'dev'	Mario	2019-01-25	2	-1/+29
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Suggestion: Publish doxygen API documentation at gitlab pages. See merge request hubzilla/core!1488
\| \| * \| \|	Publish doxygen API documentation at gitlab pages.	Klaus Weidenbach	2019-01-24	2	-1/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create the API documentation with Doxygen and publish it through gitlab-ci as a Gitlab page at: https://hubzilla.frama.io/core This should only happen when master gets updated. Update Doxyfile configuration. Correct image usage. Replace RedMatrix with Hubzilla icon.
\| * \| \| \|	Merge branch 'doku' into 'dev'	Mario	2019-01-25	12	-273/+351
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct and extend Doxygen comments. See merge request hubzilla/core!1485
\| \| * \| \| \|	Correct and extend Doxygen comments.	Klaus Weidenbach	2019-01-23	12	-273/+351
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct some documentation errors for Doxygen and add more comments. Document some undefined variables with @FIXME.
\| * \| \| \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2019-01-25	2	-1/+37
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'js_fixes' into 'dev'	Max Kostikov	2019-01-24	1	-2/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	possibly more page jumping fixes See merge request hubzilla/core!1486
\| \| * \| \| \| \| \|	possibly more page jumping fixes	Mario Vavti	2019-01-24	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'zot6_fixes' into 'dev'	Max Kostikov	2019-01-24	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	macke mod chanview aware of zot6 See merge request hubzilla/core!1487
\| \| * \| \| \| \| \|	macke mod chanview aware of zot6	Mario Vavti	2019-01-24	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'js_fixes' into 'dev'	Max Kostikov	2019-01-24	1	-2/+2
\| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| / / / \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|	fix page jumping when liking a collapsed/expanded post See merge request hubzilla/core!1484
\| \| * \| \| \| \|	fix page jumping when liking a collapsed/expanded post	Mario Vavti	2019-01-23	1	-2/+2
\| \| \|/ / / /
\| * \| \| \| \|	Merge branch 'prepare_text' into 'dev'	Mario	2019-01-23	1	-27/+34
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct parameter in include/text.php prepare_text() See merge request hubzilla/core!1483
\| \| * \| \| \| \|	Correct parameter in include/text.php prepare_text()	Klaus Weidenbach	2019-01-22	1	-27/+34
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also extend documentation.
\| * \| \| \| \|	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
\| \|_\|_\|/ / \|/\| \| \| \|