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

	Commit message (Expand)	Author	Age	Files	Lines
*	add rot47 to the mix. This shouldn't affect the speed to any measurable degree.	redmatrix	2015-05-19	4	-20/+26
*	merge redmatrix fix	redmatrix	2015-05-19	1	-2/+2
*	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-19	1	-1/+9
\|\
\| *	issue with deleting imported design elements and re-installing them	redmatrix	2015-05-19	1	-1/+9
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-19	6	-57/+80
\|\\|
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-05-19	6	-108/+127
\| \|\
\| \| *	Merge pull request #327 from solstag/help	redmatrix	2015-05-20	3	-3/+21
\| \| \|\
\| \| \| *	Document widget creation.	Alexandre Hannud Abdo	2015-05-19	2	-1/+17
\| \| \| *	Document php-xml requirement for webdav.	Alexandre Hannud Abdo	2015-05-19	1	-2/+4
\| \| * \|	remove dbg code	Mario Vavti	2015-05-19	1	-1/+1
\| \| * \|	be verbose about what type of element (block, layout, webpage) is beeing inst...	Mario Vavti	2015-05-19	1	-1/+2
\| \| \|/
\| \| *	New update Dutch	jeroenpraat	2015-05-19	2	-104/+104
\| * \|	version update	redmatrix	2015-05-19	1	-1/+1
\| \|/
* \|	mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution ciph...	redmatrix	2015-05-19	5	-35/+29
* \|	vsprintf error	redmatrix	2015-05-18	1	-1/+1
* \|	consensus items not working correctly and make the collections widget abide b...	redmatrix	2015-05-18	2	-4/+8
* \|	get rid of photo_flags in the code	redmatrix	2015-05-18	1	-7/+7
* \|	bring the new photo schema into play	redmatrix	2015-05-18	5	-53/+37
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-18	2	-4/+6
\|\\|
\| *	this should fix undeletable blocks and layouts	redmatrix	2015-05-18	2	-4/+6
* \|	fix some merge errors	redmatrix	2015-05-18	3	-1012/+1270
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-18	2	-8/+16
\|\\|
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-05-18	4	-385/+446
\| \|\
\| * \|	fix po2php to handle projectname variables correctly	redmatrix	2015-05-18	2	-8/+16
* \| \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-18	7	-134/+188
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	Mario Vavti	2015-05-18	1	-0/+47
\| \|\ \
\| \| * \	Merge pull request #326 from sierracircle/patch-1	redmatrix	2015-05-19	1	-0/+47
\| \| \|\ \
\| \| \| * \|	Create Primary-Directory	Adam Robertson	2015-05-18	1	-0/+47
\| * \| \| \|	if block title contains $content but $content title is empty do not show an e...	Mario Vavti	2015-05-18	1	-1/+1
\| \|/ / /
\| * \| \|	remove dbg code	Mario Vavti	2015-05-18	1	-2/+0
\| * \| \|	allow block title to contain $content title	Mario Vavti	2015-05-18	1	-2/+11
\| \|/ /
\| * /	Update Dutch (Projectname variable not translated yet, because of undefined v...	jeroenpraat	2015-05-18	2	-383/+390
\| \|/
\| *	spelling	redmatrix	2015-05-17	2	-4/+4
* \|	Merge branch 'tres'	redmatrix	2015-05-18	69	-843/+657
\|\ \
\| * \	Merge branch 'master' into tres	redmatrix	2015-05-17	31	-421/+612
\| \|\ \
\| * \ \	Merge branch 'master' into tres	redmatrix	2015-05-14	19	-18/+537
\| \|\ \ \
\| * \ \ \	Merge branch 'master' into tres	redmatrix	2015-05-14	187	-9453/+9692
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'master' into tres	friendica	2015-05-01	5	-3/+37
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'master' into tres	friendica	2015-04-29	26	-1122/+1210
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'master' into tres	friendica	2015-04-23	1727	-201129/+48987
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'master' into tres	friendica	2015-02-08	97	-6382/+7723
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into tres	friendica	2015-02-05	45	-5364/+6398
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into tres	friendica	2015-02-01	12	-10/+108
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into tres	friendica	2015-01-31	108	-4218/+5439
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	cleanup event form and various required indicators on inputs	friendica	2015-01-29	5	-9/+28
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into tres	friendica	2015-01-29	167	-954/+1001
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	more message restrict conversions	friendica	2015-01-29	18	-75/+78
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into tres	friendica	2015-01-27	20	-166/+302
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	sql typo	friendica	2015-01-27	1	-1/+1
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into tres and add some work on the item_deleted flag re...	friendica	2015-01-26	99	-1998/+1864
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \