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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-02-13	9	-824/+1347
\|\
\| *	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2016-02-12	6	-7/+516
\| \|\
\| \| *	don't confuse people with matrix	Jeroen van Riet Paap	2016-02-12	1	-3/+3
\| \| \|
\| \| *	https://blablanet.es/siteinfo/json reports itself as directory_mode ↵	Mario Vavti	2016-02-12	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|	DIRECTORY_MODE_PRIMARY. AFAIK this should not be the case as we can only have one primary per realm.
\| \| *	tryout: introduce loading of images before rendering content and provide ↵	Mario Vavti	2016-02-12	4	-3/+513
\| \| \| \| \| \| \| \| \| \| \| \|	some detailed logging in js-console
\| * \|	directory modes reversed	redmatrix	2016-02-12	3	-817/+831
\| \|/
* \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-02-12	11	-87/+154
\|\\|
\| *	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2016-02-11	1	-0/+1
\| \|\
\| \| *	Merge pull request #278 from royalterra/master	redmatrix	2016-02-12	1	-0/+1
\| \| \|\ \| \| \| \| \| \| \| \|	Update boot.php Add Failback Server blablanet.es
\| \| \| *	Merge pull request #1 from royalterra/royalterra-patch-1	royalterra	2016-02-11	1	-0/+1
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \|	Update boot.php Failback Server blablanet.es
\| \| \| \| *	Update boot.php Failback Server blablanet.es	royalterra	2016-02-11	1	-0/+1
\| \| \| \|/ \| \| \| \| \| \| \| \|	This HUB is running us fallback many months us fallback server
\| * \| /	whitespace	redmatrix	2016-02-11	2	-1/+2
\| \|/ /
\| * \|	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2016-02-11	1	-74/+94
\| \|\\|
\| \| *	update readmore.js to a more recent version	Mario Vavti	2016-02-11	1	-74/+94
\| \| \|
\| * \|	guest photo upload failing when js_upload is in use due to non-existent acl ↵	redmatrix	2016-02-11	3	-2/+10
\| \|/ \| \| \| \| \| \|	parameters
\| *	feed dates are always UTC. This means we will need another mechanism to pass ↵	redmatrix	2016-02-10	1	-2/+2
\| \| \| \| \| \| \| \|	localised dates to items_fetch()
\| *	feed dates weren't being honoured. When that was fixed they turned out to be ↵	redmatrix	2016-02-10	2	-3/+5
\| \| \| \| \| \| \| \|	reversed.
\| *	put a sane lower time limit on content search for public feed requests	redmatrix	2016-02-10	1	-0/+6
\| \|
\| *	hook changes to support pubsubhubbub	redmatrix	2016-02-10	3	-5/+33
\| \|
\| *	rev update	redmatrix	2016-02-10	2	-1/+2
\| \|
* \|	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 UI and strings update
\| \| \| *	[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
\| \| \| \| \| \| \| \|	piwik. Personally I think if you want to track people you really don't understand this project and its history, but whatever....
\| *	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
\| \| \| \| \| \| \| \|	This reverts commit be99c7fe12cc68bba1716a0b708bb171cfd223e6.
\| *	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
\| \| \| \| \| \| \| \|	(plus a lot more)
\| *	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
\|\\|