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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-02-09	6	-4040/+4178
\|\
\| *	Merge branch 'master' of https://github.com/redmatrix/hubzilla	jeroenpraat	2016-02-09	2	-30/+26
\| \|\
\| \| *	Merge pull request #276 from phellmes/invite	git-marijus	2016-02-09	2	-30/+26
\| \| \|\
\| \| \| *	[invite module] remove trailing spaces from translatable strings	phellmes	2016-02-09	1	-6/+6
\| \| \| *	[invite module] update UI template	phellmes	2016-02-09	1	-24/+20
\| \| \|/
\| * /	Castellano and Nederlands string updates	jeroenpraat	2016-02-09	4	-4010/+4152
\| \|/
* \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-02-09	30	-49/+246
\|\\|
\| *	need to re-arrange a few things for a short vcard	redmatrix	2016-02-08	2	-1/+46
\| *	lots more zcard tweaks	redmatrix	2016-02-08	6	-20/+57
\| *	duplicated lines in en config file	redmatrix	2016-02-08	1	-10/+0
\| *	make yet another recommended security header optional - this time because of ...	redmatrix	2016-02-08	12	-1/+107
\| *	try that patch again	redmatrix	2016-02-08	2	-11/+7
\| *	Revert "sort out the well-known acme-challenge mess - at least on apache"	redmatrix	2016-02-08	3	-6/+12
\| *	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2016-02-08	2	-3/+2
\| \|\
\| \| *	avoid collapsing only above the viewport	Mario Vavti	2016-02-08	2	-3/+2
\| * \|	sort out the well-known acme-challenge mess - at least on apache	redmatrix	2016-02-08	3	-12/+6
\| \|/
\| *	a few tweaks to uno settings page to allow a default ACL to be created	redmatrix	2016-02-07	2	-1/+8
\| *	change register workflow if uno is set	redmatrix	2016-02-07	1	-1/+1
\| *	provide get_server_role() to abstract different roles and capabilities	redmatrix	2016-02-07	4	-2/+9
\| *	block public was still referenced in admin/site template	redmatrix	2016-02-07	1	-1/+0
\| *	update UI template for 'mood' module	redmatrix	2016-02-07	2	-8/+19
* \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-02-06	29	-1494/+1604
\|\\|
\| *	fix uno import by disabling for now	redmatrix	2016-02-05	2	-1/+10
\| *	uno stuff	redmatrix	2016-02-05	3	-11/+17
\| *	more uno groundwork	redmatrix	2016-02-05	5	-4/+12
\| *	rev update	redmatrix	2016-02-05	5	-1465/+1528
\| *	remove blackout setting now that the keepout plugin performs the same tasks (...	redmatrix	2016-02-04	1	-3/+0
\| *	initial uno config	redmatrix	2016-02-04	14	-10/+37
\| *	will probably need this to make it work	redmatrix	2016-02-04	1	-1/+1
* \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-02-05	16	-47/+278
\|\\|
\| *	make strict transport security header optional	redmatrix	2016-02-04	2	-1/+3
\| *	comment buttons hook	redmatrix	2016-02-04	2	-0/+7
\| *	update docs	redmatrix	2016-02-04	1	-0/+2
\| *	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2016-02-04	1	-0/+4
\| \|\
\| \| *	Merge pull request #274 from mrjive/master	redmatrix	2016-02-05	1	-0/+4
\| \| \|\
\| \| \| *	Added section-title-wrapper and section-conent-wrapper to search result page ...	mrjive	2016-02-03	1	-0/+4
\| \| \| *	Merge pull request #21 from redmatrix/master	mrjive	2016-02-03	17	-1925/+2395
\| \| \| \|\
\| \| \| * \	Merge pull request #20 from redmatrix/master	mrjive	2016-02-01	25	-2557/+2987
\| \| \| \|\ \
\| \| \| * \ \	Merge pull request #19 from redmatrix/master	mrjive	2016-01-28	71	-4968/+5082
\| \| \| \|\ \ \
\| \| \| * \ \ \	Merge pull request #18 from redmatrix/master	mrjive	2016-01-21	51	-2025/+2343
\| \| \| \|\ \ \ \
\| \| \| * \ \ \ \	Merge pull request #17 from redmatrix/master	mrjive	2016-01-15	17	-69/+246
\| \| \| \|\ \ \ \ \
\| \| \| * \ \ \ \ \	Merge pull request #16 from redmatrix/master	mrjive	2016-01-14	8	-204/+92
\| \| \| \|\ \ \ \ \ \
\| \| \| * \ \ \ \ \ \	Merge pull request #15 from redmatrix/master	mrjive	2016-01-14	29	-55/+1043
\| \| \| \|\ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \	Merge pull request #14 from redmatrix/master	mrjive	2016-01-11	16	-22260/+23419
\| \| \| \|\ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \	Merge pull request #13 from redmatrix/master	mrjive	2016-01-10	10	-4738/+4790
\| \| \| \|\ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \	Merge pull request #12 from redmatrix/master	mrjive	2016-01-07	12	-32/+159
\| \| \| \|\ \ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \ \	Merge pull request #11 from redmatrix/master	mrjive	2016-01-04	11	-191/+261
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \ \ \	Merge pull request #10 from redmatrix/master	mrjive	2016-01-03	705	-126165/+39274
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \ \ \ \	Merge pull request #9 from redmatrix/master	mrjive	2015-12-04	150	-33202/+45858
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge pull request #8 from redmatrix/master	mrjive	2015-11-11	671	-9079/+101813
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \