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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-11-03	2	-2/+7
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/photo/photo_driver.php include/text.php mod/post.php
\| *	Update nl+es	jeroenpraat	2015-10-31	2	-2/+7
\| \|
* \|	update srings nl+es, wrapper-styled 1 tpl-file, more finetuning bluegrid schema.	jeroenpraat	2015-10-31	2	-665/+705
\| \|
* \|	es+nl strings	jeroenpraat	2015-10-26	2	-1054/+1073
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-10-19	2	-156/+258
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/zot.php install/schema_mysql.sql install/schema_postgres.sql install/update.php mod/zfinger.php
\| *	Update es+nl	jeroenpraat	2015-10-18	2	-156/+258
\| \|
\| *	Final Spanish strings for Redmatrix	jeroenpraat	2015-10-05	2	-25/+25
\| \|
* \|	Update nl+es	jeroenpraat	2015-10-18	2	-1752/+1755
\| \|
* \|	update es + nl strings	jeroenpraat	2015-10-13	2	-456/+460
\| \|
* \|	Updated Spanish strings	jeroenpraat	2015-10-05	4	-54/+54
\| \|
* \|	Updated Spanish and Dutch language strings	jeroenpraat	2015-10-03	5	-7102/+7247
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-27	2	-31/+31
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/zot.php util/messages.po
\| *	Another Spanish update	jeroenpraat	2015-09-25	2	-31/+31
\| \|
* \|	move string files to hmessages.po and hstrings.php for hubzilla to avoid ↵	redmatrix	2015-09-26	2	-0/+11230
\| \| \| \| \| \| \| \|	endless merge conflicts.
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-18	2	-5/+5
\|\\| \| \| \| \| \| \| \| \|	Conflicts: util/messages.po
\| *	Another (hopefully final) Spanish update	jeroenpraat	2015-09-17	2	-5/+5
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-14	2	-194/+194
\|\\|
\| *	Small update Spanish strings	jeroenpraat	2015-09-14	2	-194/+194
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-10	2	-463/+463
\|\\| \| \| \| \| \| \| \| \|	Conflicts: include/zot.php
\| *	update Spanish strings	jeroenpraat	2015-09-10	2	-463/+463
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-31	2	-181/+187
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/identity.php install/update.php util/messages.po view/nl/messages.po
\| *	Removed redmatrix.nl as a fallback server (directory mode to normal) + ↵	jeroenpraat	2015-08-29	2	-55/+55
\| \| \| \| \| \| \| \|	update strings ES
\| *	Update es and nl strings	jeroenpraat	2015-08-28	2	-155/+161
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-23	2	-743/+743
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/zot.php install/update.php util/messages.po
\| *	Final (temporary I suppose) Spanish string update	jeroenpraat	2015-08-22	2	-743/+743
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-20	2	-105/+105
\|\\|
\| *	Another Spanish strings update	jeroenpraat	2015-08-20	2	-105/+105
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-17	2	-297/+297
\|\\| \| \| \| \| \| \| \| \|	Conflicts: view/nl/messages.po
\| *	Final Spanish strings for now	jeroenpraat	2015-08-17	2	-297/+297
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-14	2	-17/+17
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/zot.php util/messages.po
\| *	update spanish	jeroenpraat	2015-08-14	2	-17/+17
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-12	9	-5282/+9945
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: view/es/htconfig.tpl view/es/update_fail_eml.tpl
\| *	Some corrections of Spanish strings.	jeroenpraat	2015-08-12	2	-135/+136
\| \|
\| *	Thanks to Manuel. Updated Spanish to 100 procent.	jeroenpraat	2015-08-12	9	-5281/+9942
\| \|
* \|	second pass name change	redmatrix	2015-05-05	2	-2/+2
\|/
*	raise the default upload limit for the application. We eliminated this in ↵	friendica	2015-03-01	1	-1/+1
\| \| \| \|	English long ago, but several of the translated htconfig files still have the old limit.
*	remove unused email template files	zottel	2014-10-10	8	-144/+0
\|
*	missing paren	friendica	2014-05-13	1	-1/+1
\|
*	forbid redefinition of language plural_select function	friendica	2014-05-13	1	-1/+2
\|
*	Clean up legacy smarty3	Thomas Willingham	2014-04-19	12	-291/+0
\|
*	reset email templates to English	friendica	2013-06-16	10	-88/+180
\|
*	global rename viewcontacts to viewconnections	friendica	2013-02-19	1	-5/+5
\|
*	add newline at end of header	Zach Prezkuta	2013-01-11	12	-2/+14
\|
*	add warning messae about automatically generated templates	Zach Prezkuta	2013-01-11	12	-12/+60
\|
*	add Smarty templates for international templates	Zach Prezkuta	2013-01-10	12	-0/+231
\|
*	use a single language config until all the new options are in place	friendica	2012-10-17	1	-68/+0
\|
*	relocate register policy setting in language htconfig templates	friendica	2012-10-07	1	-2/+2
\|
*	fix silly abandonded typo. shouldn't affect translations	Simon L'nu	2012-04-18	2	-2/+2
\| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
*	Merge branch 'master' of https://github.com/friendica/friendica	Alexander Kampmann	2012-04-05	15	-0/+0
\| \| \| \| \| \|	Conflicts: include/config.php update.php
*	htconfig.tpl - Friendika -> Friendica	Abinoam P. Marques Jr	2012-02-20	1	-2/+2
\|