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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge commit 'upstream/master'	Michael Vogel	2012-04-14	98	-911/+2464
\|\
\| *	pass zrl's to/through global directory	friendica	2012-04-14	2	-3/+5
\| *	one more	friendica	2012-04-13	1	-1/+1
\| *	additional marital status selectors	friendica	2012-04-13	1	-1/+1
\| *	Merge pull request #233 from simonlnu/master	Simon	2012-04-13	1	-1/+1
\| \|\
\| \| *	lighten wrapper shadow a bit on dispy	Simon L'nu	2012-04-13	1	-1/+1
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-13	0	-0/+0
\| \|/
\| *	Merge pull request #232 from simonlnu/master	Simon	2012-04-13	14	-22/+128
\| \|\
\| \| *	neat little changes. hopefully the shadow will be well recieved	Simon L'nu	2012-04-13	14	-22/+128
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-13	74	-830/+2077
\| \| \|\ \| \| \|/ \| \|/\|
\| * \|	well that was a silly mistake...	friendica	2012-04-13	2	-3/+3
\| * \|	setting wasn't being applied	friendica	2012-04-13	1	-2/+2
\| * \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-04-13	48	-115/+1085
\| \|\ \
\| \| * \|	diabook-themes: theme-settings: users can set font-size and line-height for p...	tommy tomson	2012-04-13	22	-31/+628
\| \| * \|	Merge pull request #231 from tomtom84/master	tomtom84	2012-04-13	7	-10/+209
\| \| \|\ \
\| \| \| * \|	diabook: theme-settings: users can set font-size and line-height for posts an...	tommy tomson	2012-04-13	7	-10/+209
\| \| \|/ /
\| \| * \|	diabook-themes: small fixes	tommy tomson	2012-04-13	28	-75/+249
\| * \| \|	rev update	friendica	2012-04-13	2	-511/+579
\| \|/ /
\| * \|	Merge pull request #230 from fabrixxm/master	friendica	2012-04-13	22	-201/+410
\| \|\ \
\| \| * \	Merge remote-tracking branch 'friendica/master'	Fabio Comuni	2012-04-13	72	-10973/+989
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	quattro: language icon in navbar	Fabio Comuni	2012-04-13	7	-6/+44
\| \| * \|	move html out of lang_selector() and new template lang_selector.tpl	Fabio Comuni	2012-04-13	2	-9/+26
\| \| * \|	display settings: show theme screenshot on page load	Fabio Comuni	2012-04-13	1	-1/+1
\| \| * \|	quattro: add admin theme settigs. darker items background with a bottom border.	Fabio Comuni	2012-04-13	8	-126/+79
\| \| * \|	admin: change global theme settings	Fabio Comuni	2012-04-13	3	-10/+74
\| \| * \|	quattro: work on	Fabio Comuni	2012-04-13	9	-52/+188
\| \| * \|	validate_url allow naked subdomain if is "localhost"	Fabio Comuni	2012-04-13	1	-3/+4
\| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-13	0	-0/+0
\| \| \|/ \| \|/\|
\| * \|	stray debug statements, forgot to filter pending contacts	friendica	2012-04-12	1	-5/+5
\| * \|	bug #369 - show contacts who are not in any groups	friendica	2012-04-12	5	-4/+101
\| * \|	extended the "interesting" profile attributes	friendica	2012-04-12	1	-1/+8
\| * \|	send link directly to profile tab	friendica	2012-04-12	1	-3/+3
\| * \|	stray log statements	friendica	2012-04-12	1	-2/+0
\| * \|	profile change activities	friendica	2012-04-12	4	-7/+104
\| * \|	allow setting default new friend notify	friendica	2012-04-12	3	-2/+17
\| * \|	turn off new friend activity by default	friendica	2012-04-12	1	-1/+1
\| * \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-04-12	61	-10753/+560
\| \|\ \
\| * \| \|	rev update	friendica	2012-04-12	2	-214/+198
* \| \| \|	Merge commit 'upstream/master'	Michael Vogel	2012-04-13	88	-12005/+2087
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	diabook-themes: fixed css for settings aside-links	tommy tomson	2012-04-12	20	-10546/+194
\| * \| \|	diabook-themes: css-fixes in aside	tommy tomson	2012-04-12	34	-140/+261
\| * \| \|	Merge pull request #229 from tomtom84/master	tomtom84	2012-04-12	12	-68/+106
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	fix css in aside	tommy tomson	2012-04-12	12	-68/+106
\| \|/ /
\| * /	query to find un-grouped contacts	friendica	2012-04-12	1	-1/+12
\| \|/
\| *	reverting recent db driver changes - won't install cleanly, won't update clea...	friendica	2012-04-12	3	-736/+825
\| *	Merge https://github.com/friendica/friendica into pull	friendica	2012-04-12	17	-130/+143
\| \|\
\| \| *	Merge pull request #228 from fabrixxm/master	friendica	2012-04-12	17	-130/+143
\| \| \|\
\| \| \| *	quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons i...	Fabio Comuni	2012-04-12	5	-39/+54
\| \| \| *	main.js: set notifications icon "on" with new unread notifcations. Show "Noth...	Fabio Comuni	2012-04-12	1	-9/+10
\| \| \| *	settings: remove call to profile_load()	Fabio Comuni	2012-04-12	1	-4/+0