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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-01	2	-9/+6
\|\
\| *	line 86: s/Friendika/Friendica/	Simon	2012-04-01	1	-1/+1
\| *	fix "between yourself and You" in mail list	friendica	2012-03-31	1	-8/+5
* \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-31	45	-94/+10852
\|\\|
\| *	more error handling	friendica	2012-03-31	2	-1/+4
\| *	ensure all new users get a timezone. We'll use UTC until they choose otherwise.	friendica	2012-03-31	2	-2/+6
\| *	handle escaped file chars in display and search	friendica	2012-03-31	5	-13/+10
\| *	Merge branch 'pull'	friendica	2012-03-31	12	-0/+10498
\| \|\
\| \| *	Merge pull request #193 from tomtom84/master	tomtom84	2012-03-31	12	-47/+31
\| \| \|\
\| \| \| *	diabook-themes: move "common tabs" to left side on settings page	tommy tomson	2012-03-31	12	-47/+31
\| \| \|/
\| \| *	Merge pull request #192 from tomtom84/master	tomtom84	2012-03-31	12	-0/+10514
\| \| \|\
\| \| \| *	move the common tabs to right_aside in diabook-derivates	tommy tomson	2012-03-31	12	-0/+10514
\| \| \|/
\| * /	escape % in file_tag_query as it is ultimately embedded in a sprintf	friendica	2012-03-31	2	-1/+5
\| \|/
\| *	register hooks for a COPA plugin	friendica	2012-03-31	1	-0/+7
\| *	some js fixes - ignore backspace as history selector and cleanup errors closi...	friendica	2012-03-31	1	-4/+13
\| *	Merge branch 'pull'	friendica	2012-03-31	25	-116/+355
\| \|\
\| \| *	bug fix in diabook-aerith and -red	tommy tomson	2012-03-31	6	-22/+22
\| \| *	Merge pull request #191 from tomtom84/master	tomtom84	2012-03-31	17	-40/+249
\| \| \|\
\| \| \| *	bug-fixes in diabook-derivates	tommy tomson	2012-03-31	17	-40/+249
\| \| \|/
\| * \|	settings for unknown private mail acceptance	friendica	2012-03-31	5	-18/+45
* \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-31	0	-0/+0
\| \|/ \|/\|
* \|	Merge pull request #190 from simonlnu/master	Simon	2012-03-31	2	-14/+2
\|\ \
\| * \|	forgot the css changes for last push	Simon L'nu	2012-03-31	2	-14/+2
* \| \|	Merge pull request #189 from simonlnu/master	Simon	2012-03-31	4	-44/+86
\|\\| \| \| \|/ \|/\|
\| *	theme fixes; fix qcomment (finally)	Simon L'nu	2012-03-31	4	-44/+86
\| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-31	2	-9/+7
\| \|\ \| \|/ \|/\|
* \|	warning cleanup	friendica	2012-03-30	2	-9/+7
\| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-30	32	-275/+423
\| \|\ \| \|/ \|/\|
* \|	Merge branch 'pull'	friendica	2012-03-30	31	-265/+398
\|\ \
\| * \	Merge pull request #188 from fabrixxm/master	friendica	2012-03-30	22	-218/+328
\| \|\ \
\| \| * \|	quattro: move quattro-green inside quattro folder.	Fabio Comuni	2012-03-30	16	-72/+87
\| \| * \|	allow themes to use "style.php" instead of "style.css".	Fabio Comuni	2012-03-30	2	-5/+26
\| \| * \|	Merge remote-tracking branch 'friendica/master'	Fabio Comuni	2012-03-30	6	-14/+36
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	css-fixes in diabook-derivates	tommy tomson	2012-03-30	6	-14/+36
\| \| * \|	quattro-green: remove settings code	Fabio Comuni	2012-03-30	1	-29/+0
\| \| * \|	quattro: add config.php	Fabio Comuni	2012-03-30	3	-35/+35
\| \| * \|	settings: add "display settings" tab, with UI-related settings.	Fabio Comuni	2012-03-30	3	-77/+180
\| \|/ /
\| * \|	css-fixes in diabook-derivates	tommy tomson	2012-03-30	8	-32/+29
\| * \|	catch OpenID login errors in cases when the OpenID server does not answers	Tobias Diekershoff	2012-03-30	1	-1/+5
* \| \|	don't delete contact from a friend request if friendship was already established	friendica	2012-03-30	2	-2/+6
\|/ /
* \|	css-fixes in diabook-derivates	tommy tomson	2012-03-30	6	-9/+19
* \|	quattro-green: added Description to the theme.php	Tobias Diekershoff	2012-03-30	1	-0/+1
\| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-30	0	-0/+0
\|/
*	quattro-green: adopted quattro option for centered display	Tobias Diekershoff	2012-03-30	2	-1/+56
*	Merge branch 'pull'	friendica	2012-03-30	170	-6/+18107
\|\
\| *	Merge pull request #187 from tomtom84/master	tomtom84	2012-03-30	170	-6/+18107
\| \|\
\| \| *	add themes diabook-red & diabook-aerith	tommy tomson	2012-03-30	170	-6/+18107
\| \|/
* /	string update	friendica	2012-03-30	1	-964/+1230
\|/
*	rename "file as" to "save to folder"	friendica	2012-03-30	3	-4/+4
*	Merge branch 'pull'	friendica	2012-03-30	2	-29/+128
\|\