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-04-08	1418	-2297/+4820
\|\
\| *	Merge pull request #213 from simonlnu/master	Simon	2012-04-07	7	-30/+35
\| \|\
\| \| *	minor dispy* fixes	Simon L'nu	2012-04-07	7	-30/+35
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-07	44	-153/+1476
\| \| \|\ \| \| \|/ \| \|/\|
\| * \|	diabook-themes: small fix	tommy tomson	2012-04-07	8	-0/+8
\| * \|	Merge pull request #212 from tomtom84/master	tomtom84	2012-04-07	37	-79/+1373
\| \|\ \
\| \| * \|	changelog 1.014 :	tommy tomson	2012-04-07	37	-79/+1373
\| \|/ /
\| * \|	ignore utf8 offset error for unit tests	friendica	2012-04-07	1	-1/+3
\| * \|	had arg order backwards	friendica	2012-04-07	1	-1/+1
\| * \|	try assertContains	friendica	2012-04-07	1	-1/+1
\| * \|	tag tests cont.	friendica	2012-04-07	2	-5/+15
\| * \|	fix autonamenegativelength test	friendica	2012-04-07	1	-1/+1
\| * \|	some work on tests	friendica	2012-04-07	7	-68/+77
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-07	180	-231/+365
\| \| \|\ \| \| \|/ \| \|/\|
\| * \|	ignore removed plugins	friendica	2012-04-06	1	-2/+9
\| * \|	Merge branch 'pull'	friendica	2012-04-06	176	-73/+154
\| \|\ \
\| \| * \	Merge pull request #211 from tomtom84/master	tomtom84	2012-04-06	0	-0/+0
\| \| \|\ \
\| \| \| * \	Merge remote-tracking branch 'origin/master'	tommy tomson	2012-04-06	0	-0/+0
\| \| \| \|\ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	Merge pull request #210 from tomtom84/master	tomtom84	2012-04-06	174	-54/+135
\| \| \|\ \ \
\| \| \| \| * \	Merge remote-tracking branch 'origin/master'	tommy tomson	2012-04-06	4	-24/+29
\| \| \| \| \|\ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| * \| \| \|	Merge branch 'master' of https://github.com/friendica/friendica	Tobias Diekershoff	2012-04-06	3	-156/+157
\| \| \|\ \ \ \
\| \| * \| \| \| \|	small fixes for the German strings	Tobias Diekershoff	2012-04-06	2	-19/+19
\| \| \| \| \| * \|	Merge remote-tracking branch 'origin/master'	tommy tomson	2012-04-06	1	-151/+147
\| \| \| \| \|/\| \|
\| \| \| \| * \| \|	new-contacts-introductions in contacts-drop-down and new-messages in messages...	tommy tomson	2012-04-06	174	-54/+135
\| \| \| \|/ / / \| \| \|/\| \| \|
\| * \| \| \| \|	fix messed up config tables w/ duplicate entries	friendica	2012-04-06	3	-6/+51
\| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	fix bad sql update	friendica	2012-04-06	2	-5/+10
\| \| \|/ / \| \|/\| \|
\| * \| \|	Merge branch 'pull'	friendica	2012-04-06	2	-1216/+1850
\| \|\\| \|
\| * \| \|	revert config changes, we're getting duplicate keys	friendica	2012-04-06	1	-151/+147
\| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-06	1505	-1390/+2052
\| \| \| \|\ \| \| \| \|/ \| \| \|/\|
\| \| * \|	update to the German strings	Tobias Diekershoff	2012-04-06	2	-1216/+1850
\| \|/ /
\| * \|	Merge branch 'pull'	friendica	2012-04-05	1503	-158/+179
\| \|\ \
\| \| * \	Merge branch 'master' of https://github.com/friendica/friendica	Alexander Kampmann	2012-04-05	1809	-6998/+48636
\| \| \|\ \
\| \| * \| \|	added index to config and pconfig table	Alexander Kampmann	2012-04-05	4	-160/+178
\| * \| \| \|	add network_tabs hook	friendica	2012-04-05	1	-2/+6
\| * \| \| \|	pass autoname(0) test	friendica	2012-04-05	1	-0/+3
\| * \| \| \|	rev update	friendica	2012-04-05	2	-14/+14
\| \| \|/ / \| \|/\| \|
\| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-06	0	-0/+0
\| \| \|/ \| \|/\|
\| * \|	make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php	friendica	2012-04-05	2	-1/+3
\| * \|	Merge pull request #207 from simonlnu/master	Simon	2012-04-04	2	-4/+24
\| \|\ \
\| \| * \|	finish styling category tags and category input	Simon L'nu	2012-04-05	2	-0/+20
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-05	2	-0/+12
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	also block outbound	friendica	2012-04-04	1	-0/+5
\| * \| \|	let's catch d* disabled at a higher level and not waste any resources on it.	friendica	2012-04-04	1	-0/+7
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-04	0	-0/+0
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge pull request #206 from simonlnu/master	Simon	2012-04-04	19	-131/+188
\| \|\ \ \
\| \| \| * \|	style categorytags	Simon L'nu	2012-04-04	2	-4/+4
\| \| \|/ /
\| \| * \|	update the dispy* templates	Simon L'nu	2012-04-04	19	-131/+188
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-04	4	-4/+13
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge pull request #205 from unary/filerfix	friendica	2012-04-04	1	-1/+2
\| \|\ \ \
\| \| * \| \|	correct some filer dialog weirdness caused by introduction of categories	Michael Johnston	2012-04-04	1	-1/+2
\| \|/ / /