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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge https://github.com/friendica/red into zpull	friendica	2014-03-13	6	-9/+25
\|\
\| *	Merge branch 'master' of https://github.com/friendica/red	marijus	2014-03-13	5	-6/+18
\| \|\
\| * \|	move region_1 to off instead of removing it and dont squelch region_2 when ↵	marijus	2014-03-13	6	-9/+25
\| \| \| \| \| \| \| \| \| \| \| \|	region_1 moves in again
* \| \|	remove allowed friend domains and allowed email domains from admin settings ↵	friendica	2014-03-13	2	-3/+1
\| \|/ \|/\| \| \| \| \|	- as they are not implemented
* \|	json_return_and_dir isn't a thing	Thomas Willingham	2014-03-13	1	-1/+1
\| \|
* \|	json_return_and_dir is a typo	friendica	2014-03-12	1	-1/+1
\| \|
* \|	Merge https://github.com/friendica/red into zpull	friendica	2014-03-12	2	-3/+10
\|\ \
\| * \	Merge pull request #366 from beardy-unixer/master	friendica	2014-03-13	2	-3/+10
\| \|\ \ \| \| \|/ \| \|/\|	Stick help in a template
\| \| *	Stick help in a template	Thomas Willingham	2014-03-12	2	-3/+10
\| \|/
* /	fix colors on input elements which bootstrap set to "inherit" and doesn't ↵	friendica	2014-03-12	2	-1/+6
\|/ \| \| \|	play nicely with dark themes.
*	file had wrong extension	friendica	2014-03-11	3	-16/+7
\|
*	update acl internal list whenever there is a change - the submit handler ↵	friendica	2014-03-11	1	-10/+20
\| \| \| \|	seems to be unreliable or is getting into a race condition.
*	protect filed conversations from expiration - we check the parent to see if ↵	friendica	2014-03-11	2	-1/+15
\| \| \| \|	it is filed, but one may have filed a comment and that will vanish when the parent expires unless the parent is protected.
*	get rid of fancybox for photos upload, not just photo edit	friendica	2014-03-11	2	-1/+6
\|
*	norwegian strings update	friendica	2014-03-11	2	-3/+3
\|
*	revert recent changes to cmtBbClose which removed the ability to insert ↵	friendica	2014-03-11	1	-4/+4
\| \| \| \|	quotes into an empty comment box
*	version update	friendica	2014-03-11	2	-2/+2
\|
*	failed experiment - revert the directory to 80 results per page until ↵	friendica	2014-03-10	1	-1/+1
\| \| \| \|	somebody implements endless scroll on the thing. 300 takes far too long to load all the images.
*	nb-no language update	friendica	2014-03-10	2	-8867/+7302
\|
*	Merge pull request #363 from git-marijus/master	friendica	2014-03-11	9	-51/+50
\|\ \| \| \| \|	this commit is an attempt to make conv items better scalable on smaller screens. also save some horizontal space.
\| *	10px is probably to close	marijus	2014-03-10	1	-2/+2
\| \|
\| *	fix lock position	marijus	2014-03-10	2	-7/+4
\| \|
\| *	fixes locations with a link	marijus	2014-03-10	1	-1/+1
\| \|
\| *	this commit is an attempt to make conv items better scalable on smaller ↵	marijus	2014-03-10	9	-43/+45
\|/ \| \| \|	screens. also save some horizontal space.
*	The README is getting a bit tired and really needs a re-write, but in the ↵	friendica	2014-03-10	2	-3/+1
\| \| \| \|	meanitme there's a link to donations that had to be cleaned up until we figure out how to do that without paypal.
*	update cacert.pem , don't hide url link for rmagic	friendica	2014-03-09	4	-463/+352
\|
*	describe the known flaws	friendica	2014-03-08	1	-1/+3
\|
*	advanced directory search help file	friendica	2014-03-08	2	-0/+56
\|
*	Merge https://github.com/friendica/red into zpull	friendica	2014-03-08	1	-3/+2
\|\
\| *	Merge pull request #361 from cvogeley/master	friendica	2014-03-09	1	-3/+2
\| \|\ \| \| \| \| \| \|	allow again zrl and zmg in api
\| \| *	zrl and zmg are back	Christian Vogeley	2014-03-09	1	-2/+1
\| \| \|
\| \| *	merge	Christian Vogeley	2014-03-09	335	-4412/+11486
\| \| \|\ \| \| \|/ \| \|/\|
\| \| *	.	Christian Vogeley	2014-03-09	1	-1/+2
\| \| \|
\| \| *	allow again zrl and zmg in api	Christian Vogeley	2014-03-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the problem was that the values weren’t returned and so the android client received a null value
\| \| *	Typo	cvogeley	2014-02-27	1	-1/+1
\| \| \|
\| \| *	more tweaks	Christian Vogeley	2014-02-22	1	-2/+1
\| \| \|
* \| \|	HOWTO create a derived theme lesson 1. Do not attempt to do anything more ↵	friendica	2014-03-08	2	-0/+79
\|/ / \| \| \| \| \| \|	complicated until you have successfully completed this exercise.
* \|	collapse the advanced directory search so that folks who think they're ↵	friendica	2014-03-08	2	-2/+6
\| \| \| \| \| \| \| \|	advanced but really aren't don't whinge about it.
* \|	advanced search front-end	friendica	2014-03-08	4	-2/+19
\| \|
* \|	back-end for advanced directory search	friendica	2014-03-08	1	-15/+98
\| \|
* \|	Merge https://github.com/friendica/red into zpull	friendica	2014-03-08	4	-4/+29
\|\ \
\| * \	Merge pull request #359 from beardy-unixer/master	friendica	2014-03-09	1	-1/+10
\| \|\ \ \| \| \| \| \| \| \| \|	is_developer() for those awkward "Don't touch this yet unless
\| \| * \|	is_developer() for those awkward "Don't touch this yet unless	Thomas Willingham	2014-03-08	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	you know what you're doing" commits - especially the ones with UI components.
\| * \| \|	Merge pull request #358 from git-marijus/master	friendica	2014-03-09	3	-3/+19
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	style fixes
\| \| * \|	style fixes	marijus	2014-03-08	3	-3/+19
\| \|/ /
* / /	incorrect webfinger link per fabrixxm	friendica	2014-03-08	2	-2/+2
\|/ /
* \|	missing quote	friendica	2014-03-07	1	-1/+1
\| \|
* \|	Merge pull request #357 from beardy-unixer/master	friendica	2014-03-08	2	-0/+10
\|\ \ \| \| \| \| \| \|	Create sys channels
\| * \|	Create a sys chan for hubs that already exist too.	Thomas Willingham	2014-03-07	1	-0/+7
\| \| \|
\| * \|	Merge remote-tracking branch 'upstream/master'	Thomas Willingham	2014-03-07	6	-35/+51
\| \|\ \