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-28	14	-363/+485
\|\
\| *	string update	friendica	2012-04-27	1	-75/+99
\| *	implement contact archival	friendica	2012-04-27	8	-19/+56
\| *	archive contact flag	friendica	2012-04-27	3	-2/+7
\| *	pass zrl to dfrn_request as fallback	friendica	2012-04-27	1	-0/+5
\| *	Merge https://github.com/friendica/friendica into pull	friendica	2012-04-27	5	-58/+84
\| \|\
\| \| *	Merge pull request #274 from cvogeley/master	friendica	2012-04-27	1	-22/+24
\| \| \|\
\| \| \| *	another attempt to fix lower tab behaviour on small screens, community back i...	Christian Vogeley	2012-04-27	1	-22/+24
\| \| \|/
\| * \|	rev update	friendica	2012-04-27	2	-249/+298
* \| \|	Merge remote branch 'upstream/master'	zottel	2012-04-27	7	-62/+161
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge pull request #273 from simonlnu/master	Simon	2012-04-27	4	-24/+14
\| \|\ \
\| \| * \|	remove extra netsearch-box and fix	Simon L'nu	2012-04-27	4	-24/+14
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-27	0	-0/+0
\| \|/ /
\| * \|	Merge pull request #272 from simonlnu/master	Simon	2012-04-27	4	-12/+46
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	fix contact-friend stuff on profile sidebar	Simon L'nu	2012-04-27	4	-12/+46
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-27	0	-0/+0
\| \|/
\| *	Merge https://github.com/friendica/friendica into pull	friendica	2012-04-27	4	-20/+34
\| \|\
\| \| *	Merge pull request #271 from simonlnu/master	Simon	2012-04-27	4	-20/+34
\| \| \|\
\| \| \| *	fix some css errors	Simon L'nu	2012-04-27	4	-20/+34
\| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-27	0	-0/+0
\| \| \|/
\| * /	put community back on the lower tab. It belongs with message streams	friendica	2012-04-27	1	-4/+3
\| \|/
\| *	Merge https://github.com/friendica/friendica into pull	friendica	2012-04-27	5	-1/+63
\| \|\
\| \| *	Merge pull request #270 from simonlnu/master	Simon	2012-04-26	5	-1/+63
\| \| \|\
\| \| \| *	fix 2 issues. contacts img in finder; wall filer title	Simon L'nu	2012-04-27	5	-1/+63
\| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-27	0	-0/+0
\| \| \|/
\| * /	fix view contacts	friendica	2012-04-27	1	-1/+1
\| \|/
* \|	Merge remote branch 'upstream/master'	zottel	2012-04-27	110	-8362/+11873
\|\\|
\| *	reset qcomment selector after insert.	friendica	2012-04-26	1	-0/+1
\| *	put fakelink back in birthday notice	friendica	2012-04-26	1	-1/+1
\| *	birthday contact link goes to event page instead of remote profile	friendica	2012-04-26	1	-1/+1
\| *	Merge https://github.com/friendica/friendica into pull	friendica	2012-04-26	1	-5/+5
\| \|\
\| \| *	Merge pull request #269 from simonlnu/master	Simon	2012-04-26	1	-5/+5
\| \| \|\
\| \| \| *	fix s/color/colour/g issue	Simon L'nu	2012-04-26	1	-5/+5
\| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-26	0	-0/+0
\| \| \|/
\| * \|	make comment edit icons look more like base theme	friendica	2012-04-26	5	-29/+37
\| * \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-04-26	80	-1518/+4867
\| \|\\|
\| \| *	Merge pull request #267 from tomtom84/master	friendica	2012-04-26	2	-1/+11
\| \| \|\
\| \| \| *	diabook-themes: small-fix	tommy tomson	2012-04-26	1	-1/+6
\| \| \| *	add link "remove account" to /mod/settings.php	tommy tomson	2012-04-26	1	-0/+5
\| \| * \|	Merge pull request #268 from simonlnu/master	Simon	2012-04-26	64	-1515/+3857
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|
\| \| \| *	announced dipsy change. re-tie your boots, we're in for a wee ride ;)	Simon L'nu	2012-04-26	64	-1515/+3857
\| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-26	0	-0/+0
\| \| \|/
\| \| *	Merge pull request #265 from cvogeley/master	friendica	2012-04-26	14	-2/+999
\| \| \|\
\| \| \| *	duepuntozero: move community and manage link to upper right area + css fixes ...	Christian Vogeley	2012-04-25	1	-0/+71
\| \| \| *	duepuntozero: move community and manage link to upper right area + css fixes ...	Christian Vogeley	2012-04-25	1	-2/+5
\| \| \| *	added BBCODE thing in comments	Christian Vogeley	2012-04-25	1	-0/+38
\| \| \| *	add cleanzero theme	Christian Vogeley	2012-04-25	12	-0/+885
\| * \| \|	rev update	friendica	2012-04-26	2	-3/+3
\| \|/ /
\| * \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-04-26	6	-6358/+6809
\| \|\ \
\| \| * \	Merge pull request #266 from simonlnu/master	Simon	2012-04-25	4	-6353/+6793
\| \| \|\ \