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

	Commit message (Collapse)	Author	Age	Files	Lines
*	quick fix for choklet bannertwo	Mario Vavti	2015-09-14	1	-3/+5
\|
*	fix banner for full flavour	Mario Vavti	2015-09-13	1	-4/+3
\|
*	hopefully fix banner for choklet flavour	Mario Vavti	2015-09-13	5	-22/+17
\|
*	an attempt to fix the banner mess	Mario Vavti	2015-09-12	1	-4/+3
\|
*	center page content by default	Mario Vavti	2015-09-11	1	-1/+0
\|
*	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-02	1	-1/+11
\|\
\| *	more adjustment to apps containers	redmatrix	2015-09-02	1	-2/+3
\| \|
\| *	sort out some app display weirdness	redmatrix	2015-09-02	1	-1/+10
\| \|
\| *	increase height of app-container so edit controls aren't shadowed	redmatrix	2015-09-02	1	-1/+1
\| \|
* \|	increase width of tasklist input element	redmatrix	2015-08-22	1	-1/+5
\| \|
* \|	limit the height of tasklist	redmatrix	2015-08-20	1	-0/+8
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-17	1	-1/+1
\|\\| \| \| \| \| \| \| \| \|	Conflicts: view/nl/messages.po
\| *	commit 631eb4b broke the checkboxes in admin/site, so separate normal ↵	redmatrix	2015-08-17	1	-1/+1
\| \| \| \| \| \| \| \|	checkboxes from bulk edit checkboxes in the css
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-16	1	-1/+6
\|\\|
\| *	issue #386 - account and channel bulk edit checkboxes not visible and ↵	redmatrix	2015-08-16	1	-1/+6
\| \| \| \| \| \| \| \|	therefore not useable. Also change wording to remove the offensive 'user' designation.
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-14	1	-178/+8
\|\\| \| \| \| \| \| \| \| \|	Conflicts: mod/connedit.php
\| *	cleanup connedit	Mario Vavti	2015-07-14	1	-178/+8
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-11	2	-0/+17
\|\\|
\| *	revert moving section and aside padding to style.css - it brings trouble to ↵	Mario Vavti	2015-07-11	1	-0/+14
\| \| \| \| \| \| \| \|	other layouts
\| *	add css file for mod display	Mario Vavti	2015-07-11	1	-0/+3
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-10	2	-3/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mod/editpost.php util/messages.po view/nl/messages.po view/nl/strings.php
\| *	move section and aside padding from default.css to style.css	Mario Vavti	2015-07-10	1	-2/+1
\| \|
\| *	move profile image up and refine the aside width	Mario Vavti	2015-07-09	1	-1/+1
\| \|
\| *	increase width of the aside area and make default profile image size 300x300	Mario Vavti	2015-07-09	1	-1/+1
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-07	1	-4/+0
\|\\|
\| *	various css fixes	Mario Vavti	2015-07-07	1	-4/+0
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-06	1	-0/+4
\|\\|
\| *	fix word wrapping in tagblock and dirtagblock and possibly other places	Mario Vavti	2015-07-06	1	-0/+4
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-28	1	-0/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/zot.php mod/connedit.php util/messages.po
\| *	css fixes	Mario Vavti	2015-06-27	1	-0/+2
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-23	1	-60/+13
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/items.php mod/item.php
\| *	some work on directory	Mario Vavti	2015-06-23	1	-60/+13
\| \|
* \|	more work on items	redmatrix	2015-06-11	1	-2/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php
\| *	fix rendering of affinity slider	Mario Vavti	2015-06-11	1	-2/+1
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-10	1	-4/+2
\|\\|
\| *	assign right aside the same width as we have in left aside but hide it on ↵	Mario Vavti	2015-06-10	1	-4/+2
\| \| \| \| \| \| \| \|	small and xs screens. make aside width a variablee for easier handling.
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-31	1	-1/+14
\|\\|
\| *	some fixes to make menu sharing work and expose it in the ui.	Mario Vavti	2015-05-29	1	-4/+4
\| \|
\| *	show created/edited dates for menus	Mario Vavti	2015-05-29	1	-1/+14
\| \|
* \|	Merge branch 'master' into tres	redmatrix	2015-05-14	2	-7/+8
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/Import/refimport.php include/activities.php include/attach.php include/event.php include/externals.php include/identity.php include/items.php include/notifier.php include/photos.php include/taxonomy.php include/zot.php mod/channel.php mod/connedit.php mod/events.php mod/item.php mod/like.php mod/manage.php mod/mood.php mod/ping.php mod/poke.php mod/subthread.php mod/tagger.php mod/thing.php
\| *	provide ability to create submenus	Mario Vavti	2015-05-10	2	-4/+5
\| \|
\| *	adjust icon size	Mario Vavti	2015-05-07	1	-3/+3
\| \|
* \|	Merge branch 'master' into tres	friendica	2015-04-29	3	-3/+44
\|\\| \| \| \| \| \| \| \| \|	Conflicts: include/notifier.php
\| *	Provide webpage layout description	Mario Vavti	2015-04-25	1	-3/+7
\| \|
\| *	css fixes	Mario Vavti	2015-04-24	2	-0/+8
\| \|
\| *	provide block titles in blocklist	Mario Vavti	2015-04-24	1	-4/+4
\| \|
\| *	webpages layout fixes	Mario Vavti	2015-04-24	1	-0/+29
\| \|
* \|	Merge branch 'master' into tres	friendica	2015-04-23	17	-131/+205
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css
\| *	webpages blocks fixes	Mario Vavti	2015-04-23	1	-0/+29
\| \|
\| *	provide headings for blocks and layouts	Mario Vavti	2015-04-22	2	-0/+6
\| \|