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

	Commit message (Expand)	Author	Age	Files	Lines
...
*	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-06-26	1	-0/+2
\|\
\| *	Merge branch 'master' of https://github.com/redmatrix/redmatrix	Mario Vavti	2015-06-25	4	-2697/+2871
\| \|\
\| * \|	directory: only provide connect button if we are not already connected	Mario Vavti	2015-06-24	1	-0/+2
* \| \|	project updates	redmatrix	2015-06-26	4	-196/+216
\| \|/ \|/\|
* \|	Merge pull request #360 from zzottel/master	zzottel	2015-06-24	4	-2697/+2871
\|\ \ \| \|/ \|/\|
\| *	update German help files	zottel	2015-06-24	2	-41/+56
\| *	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
*	Merge branch 'master' of https://github.com/redmatrix/redmatrix	Mario Vavti	2015-06-24	2	-2/+2
\|\
\| *	typo	redmatrix	2015-06-23	2	-2/+2
* \|	Reflect in directory title if we watch the local or the global directory	Mario Vavti	2015-06-24	1	-2/+3
\|/
*	Merge branch 'master' of https://github.com/redmatrix/redmatrix	Mario Vavti	2015-06-23	4	-7/+33
\|\
\| *	Merge pull request #356 from solstag/signature_edit_fix	redmatrix	2015-06-23	1	-2/+2
\| \|\
\| \| *	properly trims edited posts before signing so signature verification works	Alexandre Hannud Abdo	2015-06-23	1	-2/+2
\| * \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-06-22	5	-29/+29
\| \|\\|
\| * \|	ensure we always sign a trimmed item body.	redmatrix	2015-06-22	2	-4/+4
\| * \|	discovered a couple of loose ends in the per-member enable diaspora setting	redmatrix	2015-06-22	2	-1/+27
* \| \|	some work on directory	Mario Vavti	2015-06-23	6	-130/+115
\| \|/ \|/\|
* \|	Bring /help in line with the rest of the app	Mario Vavti	2015-06-22	5	-29/+29
\|/
*	import: Improve the descriptive text for this feature	redmatrix	2015-06-21	1	-2/+2
*	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-06-21	3	-7/+6
\|\
\| *	Merge pull request #355 from dawnbreak/master	redmatrix	2015-06-22	3	-9/+23
\| \|\
\| \| *	Compatible update for .htaccess.	Klaus Weidenbach	2015-06-22	3	-9/+23
\| * \|	Merge pull request #354 from redmatrix/revert-353-master	Klaus	2015-06-22	3	-23/+8
\| \|\ \
\| \| * \|	Revert "Compatible update for .htaccess."	Klaus	2015-06-22	3	-23/+8
\| \|/ /
* / /	some diaspora import issues uncovered during dry-run tests	redmatrix	2015-06-21	4	-13/+14
\|/ /
* \|	Merge pull request #353 from dawnbreak/master	redmatrix	2015-06-22	3	-8/+23
\|\ \ \| \|/ \|/\|
\| *	Compatible update for .htaccess.	Klaus Weidenbach	2015-06-21	3	-8/+23
\|/
*	do not show default in scheme selection dropdown. default.php and default.css...	Mario Vavti	2015-06-21	5	-3/+8
*	Merge pull request #352 from solstag/store_update_fix	redmatrix	2015-06-21	1	-9/+10
\|\
\| *	Make item_store_update only affect the data we requested	Alexandre Hannud Abdo	2015-06-20	1	-9/+10
* \|	ensure the photo driver is included	redmatrix	2015-06-20	1	-0/+1
* \|	import_diaspora - incorrect method for importing channel photo, and add dupli...	redmatrix	2015-06-20	2	-21/+43
* \|	wrong logic	redmatrix	2015-06-19	1	-1/+1
* \|	import_diaspora - a few more atypical settings	redmatrix	2015-06-19	1	-3/+19
* \|	automatically gunzip Diaspora export files if we're on a *nix system	redmatrix	2015-06-19	1	-0/+9
* \|	import_diaspora: add all the friends	redmatrix	2015-06-19	1	-4/+13
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-06-19	16	-308/+330
\|\ \
\| * \|	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	12	-273/+282
\| \|/
* /	very early attempt diaspora import from diaspora export file. Currently the j...	redmatrix	2015-06-19	4	-110/+221
\|/
*	set return url from apps page	redmatrix	2015-06-18	2	-1/+3
*	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-06-18	9	-7163/+7428
\|\
\| *	Merge pull request #349 from git-marijus/master	redmatrix	2015-06-17	2	-3/+15
\| \|\
\| \| *	fix deleting of album for remote channel	Mario Vavti	2015-06-16	1	-2/+2
\| \| *	make photo upload work for remote channels with perms	Mario Vavti	2015-06-16	1	-1/+13
\| * \|	Small fix in siteinfo	jeroenpraat	2015-06-16	1	-1/+1
\| \|/
\| *	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