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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote branch 'upstream/master'	zottel	2012-05-17	37	-5312/+6391
\|\
\| *	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-16	2	-2/+2
\| \|\
\| \| *	Merge pull request #301 from simonlnu/master	Simon	2012-05-16	2	-2/+2
\| \| \|\
\| \| \| *	fix admin links...	Simon L'nu	2012-05-16	2	-2/+2
\| * \| \|	rev update	friendica	2012-05-16	2	-3/+3
\| \|/ /
\| * \|	merged from wrong project	friendica	2012-05-16	1	-4/+0
\| * \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-16	4	-18/+21
\| \|\ \
\| \| * \|	Merge pull request #300 from simonlnu/master	Simon	2012-05-16	2	-2/+2
\| \| \|\\|
\| \| \| *	sigh. fix dark again	Simon L'nu	2012-05-16	2	-2/+2
\| \| * \|	Merge pull request #299 from simonlnu/master	Simon	2012-05-16	4	-16/+19
\| \| \|\\|
\| \| \| *	get rid of the monstrosity for .button. need to find alternate solution	Simon L'nu	2012-05-16	4	-16/+19
\| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-16	0	-0/+0
\| \| \|/
\| * \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-15	7	-83/+154
\| \|\\|
\| \| *	Merge pull request #298 from simonlnu/master	Simon	2012-05-15	7	-83/+154
\| \| \|\
\| \| \| *	slight re-design of wall stuff and css/font cleaning	Simon L'nu	2012-05-16	7	-83/+154
\| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-15	32	-5273/+6292
\| \| \| \|\ \| \| \| \|/ \| \| \|/\|
\| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-14	0	-0/+0
\| * \| \|	Merge https://github.com/friendica/dir into dpull	friendica	2012-05-15	1	-0/+4
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	initial commit	friendica	2012-05-15	1	-0/+4
\| \| /
\| * \|	update tinymce to 3.5.0.1	friendica	2012-05-15	26	-4805/+5696
\| * \|	rev update	friendica	2012-05-15	2	-22/+30
\| * \|	DE strings	Tobias Diekershoff	2012-05-15	2	-400/+506
* \| \|	Merge remote branch 'upstream/master'	zottel	2012-05-15	4	-49/+63
\|\\| \|
\| * \|	slackr drop shadows extended	friendica	2012-05-14	1	-1/+15
\| * \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-14	6	-192/+215
\| \|\ \
\| \| * \	Merge pull request #297 from mexon/upstream	friendica	2012-05-14	1	-1/+1
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|
\| \| \| *	Allow plugins to modify the contact photo menu	Matthew Exon	2012-05-15	1	-1/+1
\| * \| \|	rev update	friendica	2012-05-14	2	-47/+47
* \| \| \|	Merge remote branch 'upstream/master'	zottel	2012-05-14	53	-7106/+10559
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge pull request #296 from simonlnu/master	Simon	2012-05-13	5	-191/+214
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	finish dipsy light colour fixes	Simon L'nu	2012-05-14	5	-191/+214
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-14	2	-67/+67
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-13	2	-18/+24
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	rev update	friendica	2012-05-13	2	-67/+67
\| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-13	20	-252/+4973
\| \| \| \|\ \| \| \| \|/ \| \| \|/\|
\| \| * \|	diabook-theme: small fixes	tommy tomson	2012-05-13	2	-18/+24
\| \|/ /
\| * \|	rename get_language() to get_browser_language()	friendica	2012-05-13	4	-6/+6
\| * \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-12	22	-6589/+4277
\| \|\ \
\| * \| \|	slackr drop shadows	friendica	2012-05-12	3	-63/+64
\| * \| \|	language detection library	friendica	2012-05-12	11	-0/+4713
\| * \| \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-12	8	-156/+1040
\| \|\ \ \
\| * \| \| \|	rev update	friendica	2012-05-12	2	-228/+229
\| \| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-12	0	-0/+0
\| \| \| \|/
\| \| \| *	Merge pull request #295 from simonlnu/master	Simon	2012-05-12	11	-54/+89
\| \| \| \|\
\| \| \| \| *	css fixes; new screenshots	Simon L'nu	2012-05-12	11	-54/+89
\| \| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-12	4	-391/+575
\| \| \| \| \|\ \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| * \|	Merge pull request #294 from mschmitt/master	friendica	2012-05-12	4	-391/+575
\| \| \| \|\ \
\| \| \| \| * \|	Ĝisdatigis la esperantlingvan tradukaĵon al 100%.	Martin Schmitt	2012-05-12	4	-391/+575
\| \| \| \|/ / \| \| \|/\| \|
\| \| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-12	0	-0/+0
\| \| \| \|/
\| \| \| *	diabook-theme: fix in earthlayers	tommy tomson	2012-05-12	3	-29/+26