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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-02	2	-2/+4
\|\
\| *	sort out some app display weirdness	redmatrix	2015-09-02	2	-2/+4
\| \|
* \|	provide consistent ui for things	redmatrix	2015-09-01	4	-2/+20
\| \|
* \|	separate objs/things from taxonomy	redmatrix	2015-09-01	1	-4/+4
\| \|
* \|	this is weird	redmatrix	2015-08-25	2	-4/+4
\| \|
* \|	change name of module	redmatrix	2015-08-22	2	-4/+4
\| \|
* \|	some event related fixes and some base work for implementing native tasks ↵	redmatrix	2015-08-20	1	-8/+1
\| \| \| \| \| \| \| \|	(to-do lists); which should already be importable and exportable.
* \|	issues encountered whilst testing import_items module using yearly dump files	redmatrix	2015-08-17	1	-1/+1
\| \|
* \|	provide module for importing yearly content dumps	redmatrix	2015-08-17	1	-0/+15
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-17	2	-3/+3
\|\\| \| \| \| \| \| \| \| \|	Conflicts: view/nl/messages.po
\| *	commit 631eb4b broke the checkboxes in admin/site, so separate normal ↵	redmatrix	2015-08-17	2	-3/+3
\| \| \| \| \| \| \| \|	checkboxes from bulk edit checkboxes in the css
* \|	more work separating Diaspora from core	redmatrix	2015-08-03	2	-24/+0
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-31	1	-1/+1
\|\\| \| \| \| \| \| \| \| \|	Conflicts: util/messages.po
\| *	consistency of event form	redmatrix	2015-07-31	1	-1/+1
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-27	1	-6/+5
\|\\|
\| *	align buttons on event calendar	redmatrix	2015-07-27	1	-6/+5
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-27	1	-0/+13
\|\\| \| \| \| \| \| \| \| \|	Conflicts: util/messages.po
\| *	crude but more or less functional event import from thunderbird ics files	redmatrix	2015-07-26	1	-0/+13
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-26	1	-0/+9
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mod/connedit.php view/pt-br/messages.po view/pt-br/strings.php
\| *	Provide connection status if status is "a-normal"	Mario Vavti	2015-07-26	1	-0/+9
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-21	2	-3/+8
\|\\| \| \| \| \| \| \| \| \|	Conflicts: doc/to_do_code.bb
\| *	Fixes regarding the new default profile photo size. The default profile ↵	Mario Vavti	2015-07-20	1	-1/+1
\| \| \| \| \| \| \| \|	photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format.
\| *	show icons instead of disabled checkboxes	Mario Vavti	2015-07-20	1	-2/+7
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-19	1	-45/+32
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/identity.php include/widgets.php util/messages.po view/it/messages.po view/it/strings.php
\| *	fix missing div and a regression introduced in ↵	Mario Vavti	2015-07-16	1	-45/+32
\| \| \| \| \| \| \| \|	ec23a94b6d7f6db1e1d34275b8143cbc947db802 which broke tag removal for photos
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-15	2	-5/+8
\|\\|
\| *	show inherited state in Connection Default Permissions	Mario Vavti	2015-07-15	2	-5/+8
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-14	4	-151/+253
\|\\| \| \| \| \| \| \| \| \|	Conflicts: mod/connedit.php
\| *	make strings translateable	Mario Vavti	2015-07-14	1	-6/+6
\| \|
\| *	disable the inherited checkboxes for notself	Mario Vavti	2015-07-14	1	-1/+1
\| \|
\| *	fix mod_connedit.js after cleanup	Mario Vavti	2015-07-14	1	-1/+1
\| \|
\| *	revert this until further investigation	Mario Vavti	2015-07-14	1	-1/+1
\| \|
\| *	cleanup connedit	Mario Vavti	2015-07-14	4	-150/+252
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-13	2	-3/+3
\|\\|
\| *	fix sys channel menu in a morre standard way	Mario Vavti	2015-07-12	1	-1/+1
\| \|
\| *	make menu creation for sys channel work	Mario Vavti	2015-07-12	2	-3/+3
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-10	7	-79/+88
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mod/editpost.php util/messages.po view/nl/messages.po view/nl/strings.php
\| *	more webpages - generic-content-wrapper fixes	Mario Vavti	2015-07-10	3	-64/+72
\| \|
\| *	add generic content wrapper to post/webpage editor and make editpost render ↵	Mario Vavti	2015-07-10	1	-10/+12
\| \| \| \| \| \| \| \|	correctly
\| *	move profile image up and refine the aside width	Mario Vavti	2015-07-09	2	-3/+2
\| \|
\| *	increase width of the aside area and make default profile image size 300x300	Mario Vavti	2015-07-09	1	-2/+2
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-07	7	-20/+28
\|\\|
\| *	fix sorting of channel suggestions	Mario Vavti	2015-07-07	1	-4/+4
\| \|
\| *	rename function get_directory_settings => get_directory_setting and move ↵	Mario Vavti	2015-07-07	2	-7/+12
\| \| \| \| \| \| \| \|	sort options to directory title bar
\| *	various css fixes	Mario Vavti	2015-07-07	4	-6/+4
\| \|
\| *	move if clause outside of the div	Mario Vavti	2015-07-07	1	-2/+2
\| \|
\| *	use default style for default webpage	Mario Vavti	2015-07-07	1	-7/+12
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-29	1	-0/+5
\|\\|
\| *	turn the connection filter into a feature.	redmatrix	2015-06-29	1	-0/+5
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-29	1	-2/+2
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: view/nl/messages.po view/nl/strings.php