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-07-07	11	-30/+35
\|\
\| *	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
\| *	schema focus: adjust width to match photo width in /photos	Mario Vavti	2015-07-07	1	-1/+1
\| \|
\| *	various css fixes	Mario Vavti	2015-07-07	7	-15/+8
\| \|
\| *	more word wrap fixes	Mario Vavti	2015-07-07	1	-0/+2
\| \|
\| *	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-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-07-05	1	-1/+1
\|\\|
\| *	schema focus: adjust default width	Mario Vavti	2015-07-05	1	-1/+1
\| \|
\| *	Updated Italian localization	Paolo Tacconi	2015-07-03	2	-7065/+7315
\| \|
* \|	sync abook entries from redmatrix	redmatrix	2015-07-02	2	-2/+3
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php
\| *	since we can now use plain upstream justifiedGallery library - switch to ↵	Mario Vavti	2015-07-01	1	-2/+2
\| \| \| \| \| \| \| \|	minified version
\| *	update justifiedGallery to versio 3.6.0	Mario Vavti	2015-07-01	1	-0/+1
\| \|
* \|	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	2	-3/+7
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: view/nl/messages.po view/nl/strings.php
\| *	Update NL + 1 revert css, see comment here: ↵	jeroenpraat	2015-06-30	3	-348/+374
\| \| \| \| \| \| \| \|	https://github.com/redmatrix/redmatrix/commit/22b9e97ae2e46513c7a43cb27e7230bc5c40b9d4
\| *	Probably a ugly hack, but it's the only way I could found that cuts off very ↵	jeroenpraat	2015-06-29	1	-0/+5
\| \| \| \| \| \| \| \|	long channel names in the admin area. If there's a better alternative, be my guest.
\| *	fix directory location	Mario Vavti	2015-06-29	1	-2/+2
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-28	4	-3/+16
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/zot.php mod/connedit.php util/messages.po
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-06-28	2	-1/+7
\| \|\
\| \| *	css fixes	Mario Vavti	2015-06-27	2	-1/+7
\| \| \|
\| * \|	no this isn't it. well ok, it's part of it, but not the important part. it's ↵	redmatrix	2015-06-28	2	-2/+7
\| \|/ \| \| \| \| \| \|	still pretty cool.
\| *	Merge branch 'master' of https://github.com/redmatrix/redmatrix	Mario Vavti	2015-06-25	2	-2656/+2815
\| \|\
\| * \|	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-24	2	-0/+92
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/de/features.bb view/de/messages.po view/de/strings.php
\| * \|	update to German strings	zottel	2015-06-24	2	-2656/+2815
\| \|/
\| *	Add a new redbasic scheme called focus - It is supposed to focus on the main ↵	Mario Vavti	2015-06-24	2	-0/+92
\| \| \| \| \| \| \| \|	content by adding a slight shadow and centering the main content on the screen. Also the default width of the content is set to 640px.
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-23	6	-118/+99
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/items.php mod/item.php
\| *	some work on directory	Mario Vavti	2015-06-23	5	-116/+92
\| \|
\| *	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	20	-308/+345
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/items.php util/messages.po
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-06-21	1	-2/+2
\| \|\
\| \| *	Compatible update for .htaccess.	Klaus Weidenbach	2015-06-22	1	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \|	This should hopefully work in Apache 2.2 and 2.4.
\| * \|	some diaspora import issues uncovered during dry-run tests	redmatrix	2015-06-21	1	-0/+3
\| \| \|
\| * \|	Compatible update for .htaccess.	Klaus Weidenbach	2015-06-21	1	-2/+8
\| \|/ \| \| \| \| \| \|	This should hopefully work in Apache 2.2 and 2.4.
\| *	do not show default in scheme selection dropdown. default.php and ↵	Mario Vavti	2015-06-21	3	-3/+6
\| \| \| \| \| \| \| \|	default.css should be symlinks. adjust doco accordingly.
\| *	more generic-content-wrapper and some css fixes	Mario Vavti	2015-06-19	3	-35/+44
\| \|
\| *	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	4	-158/+187
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: view/nl/messages.po view/nl/strings.php
\| *	Merge branch 'master' of https://github.com/redmatrix/redmatrix	Mario Vavti	2015-06-15	2	-6998/+7222
\| \|\
\| \| *	Update Dutch language strings	jeroenpraat	2015-06-15	2	-6998/+7222
\| \| \|
\| * \|	update spin.js	Mario Vavti	2015-06-15	2	-157/+184
\| \|/