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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #235 from simonlnu/master	Simon	2012-04-14	6	-7/+7
\|\ \| \| \| \|	string fix: typo. slow down scroll to top in dispys
\| *	string fix: typo. slow down scroll to top in dispys	Simon L'nu	2012-04-14	6	-7/+7
\| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-14	7	-8/+24
\| \|\ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: bogus empty list element in dfrn_request page when emailnet not enabled zrl on random profile zrl hook bug #372 - category feeds pass zrl's to/through global directory * master:
* \|	bogus empty list element in dfrn_request page when emailnet not enabled	friendica	2012-04-14	2	-2/+2
\| \|
* \|	zrl on random profile	friendica	2012-04-14	1	-1/+1
\| \|
* \|	zrl hook	friendica	2012-04-14	1	-2/+6
\| \|
* \|	bug #372 - category feeds	friendica	2012-04-14	1	-0/+10
\| \|
* \|	pass zrl's to/through global directory	friendica	2012-04-14	2	-3/+5
\| \|
\| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-14	0	-0/+0
\|/ \| \| \| \| \| \| \|	* remotes/upstream/master: one more additional marital status selectors * master:
*	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
\| *	lighten wrapper shadow a bit on dispy	Simon L'nu	2012-04-13	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-13	0	-0/+0
\|/ \| \| \| \| \|	* remotes/upstream/master: * master:
*	Merge pull request #232 from simonlnu/master	Simon	2012-04-13	14	-22/+128
\|\ \| \| \| \|	neat little changes. hopefully the shadow will be well recieved
\| *	neat little changes. hopefully the shadow will be well recieved	Simon L'nu	2012-04-13	14	-22/+128
\| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-13	74	-830/+2077
\| \|\ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: well that was a silly mistake... setting wasn't being applied rev update diabook-themes: theme-settings: users can set font-size and line-height for posts and comments diabook: theme-settings: users can set font-size and line-height for posts and comments diabook-themes: small fixes quattro: language icon in navbar move html out of lang_selector() and new template lang_selector.tpl display settings: show theme screenshot on page load quattro: add admin theme settigs. darker items background with a bottom border. admin: change global theme settings quattro: work on "like" activitiy items less visible fixes to widths popup notification out of navbar category input in jot validate_url allow naked subdomain if is "localhost" * master:
* \|	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 ↵	tommy tomson	2012-04-13	22	-31/+628
\| \| \| \| \| \| \| \| \| \| \| \|	posts and comments
\| * \|	Merge pull request #231 from tomtom84/master	tomtom84	2012-04-13	7	-10/+209
\| \|\ \ \| \| \| \| \| \| \| \|	fixes in theme diabook
\| \| * \|	diabook: theme-settings: users can set font-size and line-height for posts ↵	tommy tomson	2012-04-13	7	-10/+209
\| \|/ / \| \| \| \| \| \| \| \| \|	and comments
\| * \|	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
\|\ \ \| \| \| \| \| \|	some work, mainly on quattro
\| * \	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"like" activitiy items less visible fixes to widths popup notification out of navbar category input in jot
\| * \|	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
\| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: (22 commits) stray debug statements, forgot to filter pending contacts bug #369 - show contacts who are not in any groups extended the "interesting" profile attributes send link directly to profile tab stray log statements profile change activities allow setting default new friend notify turn off new friend activity by default rev update diabook-themes: fixed css for settings aside-links diabook-themes: css-fixes in aside fix css in aside query to find un-grouped contacts reverting recent db driver changes - won't install cleanly, won't update cleanly, and leaks DB credentials over the web if there's a connection problem turn off update transactions until we figure out how to do them safely. table cleanup quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons in a toolbar in notifications menu main.js: set notifications icon "on" with new unread notifcations. Show "Nothing new here" with no notifications at all settings: remove call to profile_load() quattro: move center css to style.php. add tpl for generic_links_widget ... * master:
* \|	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
\|\ \
\| * \|	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
\| \|\ \ \| \| \| \| \| \| \| \|	fixes in theme diabook
\| \| * \|	fix css in aside	tommy tomson	2012-04-12	12	-68/+106
\| \|/ /
* / /	rev update	friendica	2012-04-12	2	-214/+198
\|/ /
* /	query to find un-grouped contacts	friendica	2012-04-12	1	-1/+12
\|/