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

	Commit message (Expand)	Author	Age	Files	Lines
*	resolve merge conflict	zotlabs	2017-05-20	2	-24/+24
*	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	Mario Vavti	2017-05-19	3	-13/+13
\|\
\| *	some styling for system notifications	Mario Vavti	2017-05-18	3	-13/+13
* \|	smileybutton fixes	Mario Vavti	2017-05-19	1	-2/+0
\|/
*	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	Mario Vavti	2017-05-17	13	-497/+2764
\|\
\| *	Merge pull request #783 from zotlabs/app_order	git-marijus	2017-05-17	2	-0/+46
\| \|\
\| \| *	provide mechanism to arbitrarily sort the nav tray apps, currently the prefer...	zotlabs	2017-05-16	2	-0/+46
\| * \|	Merge pull request #782 from dawnbreak/QA_testing	git-marijus	2017-05-17	2	-52/+254
\| \|\ \
\| \| * \|	:construction_worker::white_check_mark: Documentation Permissions.php.	Klaus Weidenbach	2017-05-17	2	-52/+254
\| \| \|/
\| * \|	Merge pull request #780 from zotlabs/docbug	git-marijus	2017-05-17	2	-10/+12
\| \|\ \
\| \| * \|	no bug reporting info in docs	zotlabs	2017-05-15	2	-10/+12
\| * \| \|	Merge pull request #778 from beardyunixer/dev	git-marijus	2017-05-17	1	-1/+1
\| \|\ \ \
\| \| * \| \|	Update nginx	Thomas Willingham	2017-05-15	1	-1/+1
\| \| \|/ /
\| * \| \|	Merge pull request #774 from zotlabs/pgapps	git-marijus	2017-05-17	1	-5/+5
\| \|\ \ \
\| \| * \| \|	Do not yet understand why on postgres, app['plugin'] gets set to 3 linefeeds ...	zotlabs	2017-05-14	1	-5/+5
\| * \| \| \|	Merge pull request #775 from zotlabs/pgstuff	git-marijus	2017-05-17	3	-429/+429
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| \| * \| \|	always wonder about people who say "do as I say, not as I do..."	zotlabs	2017-05-14	3	-429/+429
\| \| \| \|/ \| \| \|/\|
\| * \| \|	regenerate optimized autoload files	Mario Vavti	2017-05-16	2	-0/+2016
\| * \| \|	include attach.php here (boot.php) instead of each file that uses it. Eventua...	zotlabs	2017-05-16	1	-0/+1
\| \|/ /
* \| \|	css first aid for mod setup	Mario Vavti	2017-05-17	1	-0/+6
* \| \|	silence php warning during install	Mario Vavti	2017-05-17	1	-1/+1
\|/ /
* \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	Mario Vavti	2017-05-12	4	-16/+42
\|\ \
\| * \	Merge pull request #770 from zotlabs/mast496	git-marijus	2017-05-12	3	-14/+40
\| \|\ \
\| \| * \|	consolidate and simplify the generation of activitystreams persons, add a cou...	zotlabs	2017-05-11	3	-14/+40
\| * \| \|	Merge pull request #771 from zotlabs/filesync	git-marijus	2017-05-12	1	-2/+2
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|
\| \| * \|	issue #769	zotlabs	2017-05-11	1	-2/+2
\| \| \|/
* \| /	Empty ACL should not result in no ACL when uploading a file	Mario Vavti	2017-05-11	1	-4/+5
\|/ /
* \|	Merge pull request #767 from zotlabs/realm_ac	git-marijus	2017-05-11	1	-1/+3
\|\ \ \| \|/ \|/\|
\| *	send directory realm_token for navbar autocomplete searches - if configured	zotlabs	2017-05-10	1	-1/+3
* \|	missing clearfix	Mario Vavti	2017-05-10	3	-3/+3
* \|	Merge pull request #766 from phellmes/dev	git-marijus	2017-05-10	2	-11071/+10554
\|\ \
\| * \|	Update DE translation strings	phellmes	2017-05-09	2	-11071/+10554
\| \|/
* \|	don't allow html in plugin comment blocks	zotlabs	2017-05-10	1	-0/+1
* \|	use correct data type	zotlabs	2017-05-10	1	-1/+1
* \|	zot protocol doco updates	zotlabs	2017-05-10	1	-2/+2
* \|	handle mastodon urls in markdown/bbcode conversion	zotlabs	2017-05-10	2	-3/+3
\|/
*	make all label bold	Mario Vavti	2017-05-09	1	-1/+1
*	Merge pull request #763 from anaqreon/dev	git-marijus	2017-05-09	1	-1/+43
\|\
\| *	Implemented switch statement logic in Comanche layout parser.	root	2017-05-08	1	-1/+43
* \|	Merge pull request #762 from mjfriaza/dev	git-marijus	2017-05-09	2	-544/+564
\|\ \ \| \|/ \|/\|
\| *	Updated the Spanish translation	Manuel Jiménez Friaza	2017-05-08	2	-544/+564
* \|	get rid of edit activities	zotlabs	2017-05-08	1	-1/+11
* \|	cover photo was unintentionally disabled when block_public in effect	zotlabs	2017-05-08	1	-3/+4
* \|	Merge pull request #756 from dawnbreak/QA_testing	git-marijus	2017-05-07	4	-6/+22
\|\ \
\| * \|	:construction_worker::white_check_mark::bug: Import table structure in TravisCI.	Klaus Weidenbach	2017-05-06	4	-6/+22
* \| \|	Merge pull request #761 from anaqreon/dev	git-marijus	2017-05-07	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Mail subject bug fix	Andrew Manning	2017-05-07	1	-1/+1
\|/ /
* \|	collapse sysapps if viewing a remote channel	Mario Vavti	2017-05-05	3	-11/+38
* \|	css hack to make remote channel menu header look in line with the rest if in ...	Mario Vavti	2017-05-05	1	-0/+6
* \|	css fix	Mario Vavti	2017-05-05	1	-1/+1