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

	Commit message (Collapse)	Author	Age	Files	Lines
*	merge from redmatrix	redmatrix	2015-07-13	1	-1/+1
\|
*	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-13	6	-11/+30
\|\
\| *	Merge pull request #373 from zzottel/master	redmatrix	2015-07-14	1	-0/+18
\| \|\ \| \| \| \| \| \|	change account_default_channel if default channel is removed
\| \| *	change account_default_channel if default channel is removed	zottel	2015-07-13	1	-0/+18
\| \|/
\| *	Only let local logins install webpage elements	redmatrix	2015-07-11	1	-1/+5
\| \|
\| *	allow sys editing of menu	redmatrix	2015-07-11	1	-0/+1
\| \|
\| *	whitespace and comment out info again	Mario Vavti	2015-07-12	2	-3/+3
\| \|
\| *	fix sys channel menu in a morre standard way	Mario Vavti	2015-07-12	3	-5/+5
\| \|
\| *	menu_id is still needed	Mario Vavti	2015-07-12	1	-0/+1
\| \|
\| *	Merge branch 'master' of https://github.com/redmatrix/redmatrix	Mario Vavti	2015-07-12	1	-1/+1
\| \|\
\| * \|	make menu creation for sys channel work	Mario Vavti	2015-07-12	4	-10/+5
\| \| \|
* \| \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-11	4	-17/+24
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-07-11	3	-16/+23
\| \|\\|
\| \| *	fix issue with profile photo	Mario Vavti	2015-07-11	1	-6/+6
\| \| \|
\| \| *	more revert	Mario Vavti	2015-07-11	1	-5/+0
\| \| \|
\| \| *	revert moving section and aside padding to style.css - it brings trouble to ↵	Mario Vavti	2015-07-11	2	-5/+14
\| \| \| \| \| \| \| \| \| \| \| \|	other layouts
\| \| *	Merge branch 'master' of https://github.com/redmatrix/redmatrix	Mario Vavti	2015-07-11	2	-169/+171
\| \| \|\
\| \| * \|	add css file for mod display	Mario Vavti	2015-07-11	1	-0/+3
\| \| \| \|
\| * \| \|	revision update	redmatrix	2015-07-11	1	-1/+1
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-10	22	-135/+164
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mod/editpost.php util/messages.po view/nl/messages.po view/nl/strings.php
\| * \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-07-10	23	-409/+499
\| \|\\|
\| \| *	Merge branch 'master' of https://github.com/redmatrix/redmatrix	Mario Vavti	2015-07-10	2	-274/+336
\| \| \|\
\| \| \| *	update Dutch strings	jeroenpraat	2015-07-10	2	-274/+336
\| \| \| \|
\| \| * \|	show status editor in /display on share action.	Mario Vavti	2015-07-10	1	-1/+4
\| \| \|/
\| \| *	css fixes	Mario Vavti	2015-07-10	1	-2/+8
\| \| \|
\| \| *	do not change selected/active class color on hover	Mario Vavti	2015-07-10	1	-1/+10
\| \| \|
\| \| *	re-enable selected/active class	Mario Vavti	2015-07-10	1	-4/+3
\| \| \|
\| \| *	more webpages - generic-content-wrapper fixes	Mario Vavti	2015-07-10	6	-79/+90
\| \| \|
\| \| *	add generic content wrapper to post/webpage editor and make editpost render ↵	Mario Vavti	2015-07-10	3	-20/+20
\| \| \| \| \| \| \| \| \| \| \| \|	correctly
\| \| *	schema focus: refine content width to be more in balance with the recent ↵	Mario Vavti	2015-07-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	aside width
\| \| *	move section and aside padding from default.css to style.css	Mario Vavti	2015-07-10	4	-8/+6
\| \| \|
\| \| *	revert	Mario Vavti	2015-07-09	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	do not show status editor in /display - we most probably want to read the thread or comment.
\| \| *	fix vcard title spacing	Mario Vavti	2015-07-09	1	-1/+2
\| \| \|
\| \| *	do not show status editor in /display - we most probably want to read the ↵	Mario Vavti	2015-07-09	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|	thread or comment.
\| \| *	fix aside width for collapsed state	Mario Vavti	2015-07-09	2	-2/+2
\| \| \|
\| \| *	move profile image up and refine the aside width	Mario Vavti	2015-07-09	6	-11/+11
\| \| \|
\| \| *	remove padding	Mario Vavti	2015-07-09	1	-1/+0
\| \| \|
\| \| *	increase width of the aside area and make default profile image size 300x300	Mario Vavti	2015-07-09	7	-11/+12
\| \| \|
\| \| *	fix typo to make directory safe mode default to on work again	Mario Vavti	2015-07-08	1	-1/+1
\| \| \|
\| * \|	revision update	redmatrix	2015-07-10	2	-169/+171
\| \| \|
\| * \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-07-07	15	-87/+80
\| \|\\|
\| * \|	version update	redmatrix	2015-07-07	1	-1/+1
\| \| \|
* \| \|	inconsistent naming of block item types	redmatrix	2015-07-08	4	-6/+6
\| \| \|
* \| \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-07	15	-87/+80
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	fix sorting of channel suggestions	Mario Vavti	2015-07-07	3	-5/+6
\| \| \|
\| * \|	rename function get_directory_settings => get_directory_setting and move ↵	Mario Vavti	2015-07-07	5	-32/+26
\| \| \| \| \| \| \| \| \| \| \| \|	sort options to directory title bar
\| * \|	make public forums only setting sticky and simplify function to get ↵	Mario Vavti	2015-07-07	3	-39/+34
\| \| \| \| \| \| \| \| \| \| \| \|	directory settings
\| * \|	code style correction	Mario Vavti	2015-07-07	1	-3/+2
\| \| \|
\| * \|	make directory suggest work with directory options	Mario Vavti	2015-07-07	2	-3/+7
\| \| \|
\| * \|	schema focus: adjust width to match photo width in /photos	Mario Vavti	2015-07-07	1	-1/+1
\| \| \|