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

	Commit message (Collapse)	Author	Age	Files	Lines
*	reduce the scope a bit	friendica	2012-05-01	2	-19/+11
\|
*	add template	friendica	2012-05-01	1	-0/+21
\|
*	fn not found	friendica	2012-05-01	1	-0/+1
\|
*	really fat fingers today - though none of this has gone further than my own site	friendica	2012-05-01	1	-1/+1
\|
*	another one	friendica	2012-05-01	1	-1/+1
\|
*	typo	friendica	2012-05-01	1	-1/+1
\|
*	first try common friends for visitors	friendica	2012-05-01	4	-1/+86
\|
*	improve handling of relative feed url's	friendica	2012-05-01	1	-1/+1
\|
*	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-01	5	-11/+13
\|\
\| *	More Diabook-dark touch-ups. Should really be useable this time...with ↵	Thomas Willingham	2012-05-01	2	-5/+7
\| \| \| \| \| \| \| \|	editplain anyway.
\| *	modified: images/smiley-thumbsup.gif	Thomas Willingham	2012-05-01	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Restored some yellow where there shouldn't have been transparency. Probably introduced by me in the first place.
\| *	diabook-themes: small fix at "community pages"-box	tommy tomson	2012-05-01	2	-6/+6
\| \|
* \|	convert html entities to utf-8 before email header encoding	friendica	2012-05-01	3	-194/+202
\|/
*	link socgraph to zrls	friendica	2012-05-01	2	-25/+21
\|
*	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-01	2	-9/+11
\|\
\| *	Merge pull request #281 from simonlnu/master	Simon	2012-05-01	2	-9/+11
\| \|\ \| \| \| \| \| \|	font and background adjustments
\| \| *	lighten bg and darken font on dispy light	Simon L'nu	2012-05-01	2	-9/+11
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-01	0	-0/+0
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: hidden plugins (add .hidden file to dir) * master:
* /	adding zrl support to social graphs	friendica	2012-05-01	5	-18/+39
\|/
*	Merge https://github.com/friendica/friendica into pull	friendica	2012-04-30	27	-84/+119
\|\
\| *	Merge pull request #280 from simonlnu/master	Simon	2012-04-30	5	-15/+9
\| \|\ \| \| \| \| \| \|	added a / for consistency's sake ;p
\| \| *	sub-minor change to head.tpl	Simon L'nu	2012-05-01	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-05-01	34	-462/+1041
\| \| \|\ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: diabook-themes: add "community profiles"-box to right_column change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter rev update start adding tooltips to tab menus fix join group notifications * master:
\| * \|	diabook-themes: add "community profiles"-box to right_column	tommy tomson	2012-05-01	22	-69/+110
\| \| \|
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-30	18	-1821/+1750
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: provide "xxx joined yyy" notifications adding META viewport tag for better look on tablets Update Esperanto to 100% DE update to the strings activitystreams schema constants for "join group" missed a db field typo in profile_selectors, fix remote tagging not all profile selector choices have unique or direct translations log db error strings in all cases admin page to manage failed updates improved db error logging close one menu (like the notifications menu) when another one is opened (like it is done when clicking somewhere else) (thx to ^mw) * master:
\| \| * \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-29	29	-144/+238
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: the heart should really be red. fix location change notification enhanced profile reporting for single values add db field for removed account, which will also be the first test of update error checking toggle to archive unfriends, though render them useless indicate successful updates diabook-themes: small fix diabook-themes: bug/css-fixes some constants for the db update failure possibilities bring back the email and logging of update failures, but without the transactions * master:
\| \| * \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-28	4	-134/+149
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: a few more continues that should be returns small bugfix. sometimes also avatar pics were rescaled * master:
\| \| * \ \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-28	1	-1/+1
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: poller refactor: continue not valid in this context * master:
\| \| * \ \ \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-28	10	-445/+548
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: break up poller into separate processes add tooltip title to common_tabs PRIVACY: if wall is blocked, don't provide public keywords in HTML meta Diabook-dark update, it's almost useable now (if you're lenient). Added "important changes" to admin menu for admins who don't follow the github properly. * master:
\| \| * \| \| \| \| \|	fix #search-text	Simon L'nu	2012-04-27	4	-14/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \| \| \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-27	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: string update implement contact archival archive contact flag pass zrl to dfrn_request as fallback rev update another attempt to fix lower tab behaviour on small screens, community back in tab area * master:
* \| \| \| \| \| \| \|	hidden plugins (add .hidden file to dir)	friendica	2012-04-30	7	-12/+111
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #279 from fermionic/generate-random-id-bug-in-statusnet-api	friendica	2012-04-30	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug in StatusNet API
\| * \| \| \| \| \| \|	change api.php in function api_item_get_user to check if $usercache is NULL ↵	Zach Prezkuta	2012-04-30	1	-1/+1
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	before checking an element in it
* \| \| \| \| \| \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-04-30	5	-7/+327
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	diabook-themes: add "last tweets"-box to right_aside, that searches for ↵	tommy tomson	2012-05-01	5	-7/+327
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#friendica on twitter
* \| \| \| \| \| \| \|	make 'aaa joined group bbb' work from the initiating end, new privacy pref ↵	friendica	2012-04-30	3	-29/+81
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to control it also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
* \| \| \| \| \| \|	rev update	friendica	2012-04-30	2	-359/+500
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	start adding tooltips to tab menus	friendica	2012-04-30	3	-0/+23
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	fix join group notifications	friendica	2012-04-30	2	-5/+7
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #277 from mschmitt/master	friendica	2012-04-30	2	-784/+649
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Esperanto to 100%
\| * \| \| \| \| \|	Update Esperanto to 100%	Martin Schmitt	2012-04-30	2	-784/+649
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #278 from max-weller/meta_viewport	friendica	2012-04-30	1	-0/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	adding META viewport tag for better look on tablets
\| * \| \| \| \| \| \|	adding META viewport tag for better look on tablets	Max Weller	2012-04-30	1	-0/+1
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-04-30	4	-868/+766
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' of https://github.com/friendica/friendica	Tobias Diekershoff	2012-04-30	1	-0/+3
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	DE update to the strings	Tobias Diekershoff	2012-04-30	4	-868/+766
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	provide "xxx joined yyy" notifications	friendica	2012-04-30	1	-11/+34
\| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	activitystreams schema constants for "join group"	friendica	2012-04-29	1	-0/+3
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #276 from tomtom84/master	friendica	2012-04-29	1	-6/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	close one menu (like notificationsmenu) when another one is opened (like when clicking somewhere else)