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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| *	fix directory location	Mario Vavti	2015-06-29	1	-2/+2
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-28	2	-2/+8
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/zot.php mod/connedit.php util/messages.po
\| *	no this isn't it. well ok, it's part of it, but not the important part. it's ↵	redmatrix	2015-06-28	1	-2/+6
\| \| \| \| \| \| \| \|	still pretty cool.
\| *	directory: only provide connect button if we are not already connected	Mario Vavti	2015-06-24	1	-0/+2
\| \|
* \|	localise event calendar	redmatrix	2015-06-25	2	-0/+25
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-23	3	-56/+84
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/items.php mod/item.php
\| *	some work on directory	Mario Vavti	2015-06-23	2	-54/+77
\| \|
\| *	Bring /help in line with the rest of the app	Mario Vavti	2015-06-22	1	-2/+7
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-21	16	-301/+321
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/items.php util/messages.po
\| *	some diaspora import issues uncovered during dry-run tests	redmatrix	2015-06-21	1	-0/+3
\| \|
\| *	do not show default in scheme selection dropdown. default.php and ↵	Mario Vavti	2015-06-21	1	-1/+1
\| \| \| \| \| \| \| \|	default.css should be symlinks. adjust doco accordingly.
\| *	more generic-content-wrapper and some css fixes	Mario Vavti	2015-06-19	2	-32/+33
\| \|
\| *	cloud.tpl	Mario Vavti	2015-06-19	1	-0/+4
\| \|
\| *	bring some more generic-content-wrappers and fix some of them	Mario Vavti	2015-06-19	11	-268/+280
\| \|
* \|	more photos work	redmatrix	2015-06-17	1	-1/+1
\| \|
* \|	lots of work on merging photo and file albums/folders	redmatrix	2015-06-17	1	-0/+3
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-15	2	-1/+3
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: view/nl/messages.po view/nl/strings.php
\| *	do not allow/show acl button on photo edit if not owner	Mario Vavti	2015-06-15	2	-1/+3
\| \|
* \|	more work on items	redmatrix	2015-06-11	1	-0/+3
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-0/+3
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-09	2	-0/+2
\|\\|
\| *	put mirror_frontpage setting into admin/site	redmatrix	2015-06-09	1	-0/+1
\| \|
\| *	toggle diaspora protocol on a per-channel level in addition to the existing ↵	redmatrix	2015-06-09	1	-0/+1
\| \| \| \| \| \| \| \|	per site setting. Default is enabled if the site setting is enabled.
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-09	1	-1/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: install/schema_mysql.sql mod/home.php mod/page.php view/nl/messages.po view/nl/strings.php
\| *	more frontpage tweaks	redmatrix	2015-06-07	1	-1/+1
\| \|
\| *	reverse logic of homepage login setting	redmatrix	2015-06-07	1	-1/+1
\| \|
\| *	frontpage tweaks	redmatrix	2015-06-07	1	-0/+1
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-06	1	-3/+3
\|\\| \| \| \| \| \| \| \| \|	Conflicts: util/messages.po
\| *	Added translatable strings to the Display Settings page and refreshed ↵	jeroenpraat	2015-06-06	1	-3/+3
\| \| \| \| \| \| \| \|	util/messages.po.
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-31	3	-9/+15
\|\\|
\| *	add some yes/no labels and minor template fixes	Mario Vavti	2015-05-29	2	-3/+3
\| \|
\| *	some fixes to make menu sharing work and expose it in the ui.	Mario Vavti	2015-05-29	1	-8/+10
\| \|
\| *	show created/edited dates for menus	Mario Vavti	2015-05-29	1	-2/+6
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-25	1	-1/+2
\|\\|
\| *	add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle ↵	redmatrix	2015-05-25	1	-1/+2
\| \| \| \| \| \| \| \|	the censor flag from that page.
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-20	1	-0/+3
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/items.php include/text.php mod/item.php view/nl/messages.po
\| *	PRIVACY: possible privacy leakage under a defined set of circumstances	redmatrix	2015-05-20	1	-0/+3
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-10	3	-3/+14
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mod/mitem.php view/de/messages.po view/de/strings.php
\| *	provide drop down submenu suggestions in edit mode	Mario Vavti	2015-05-10	1	-0/+2
\| \|
\| *	copy/paste typo	Mario Vavti	2015-05-10	1	-1/+1
\| \|
\| *	provide ability to create submenus	Mario Vavti	2015-05-10	4	-4/+13
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-07	1	-1/+5
\|\\|
\| *	provide wrap variable for comanche menus	Mario Vavti	2015-05-07	1	-1/+5
\| \|
* \|	missed one...	redmatrix	2015-05-06	1	-1/+1
\| \|
* \|	change notification colour	redmatrix	2015-05-06	1	-1/+1
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-06	2	-0/+18
\|\\|
\| *	turn consensus items into diaspora polls for that network	redmatrix	2015-05-05	2	-0/+18
\| \|
* \|	second pass name change	redmatrix	2015-05-05	2	-3/+3
\| \|
* \|	first pass name change	redmatrix	2015-05-05	2	-2/+2
\|/