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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| *	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
\| *	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
\|\\|