merged 2.0 branch

2013-03-30 13:55:18 +00:00
parent 395cadfddf
commit 3b0b5a5c0b
55 changed files with 1510 additions and 21361 deletions
--- a/config.php
+++ b/config.php
@@ -6,4 +6,8 @@
 	
 	/** The default calendar to import to*/
 	define('PLUGIN_CALENDARIMPORTER_DEFAULT', "calendar");
+	define('PLUGIN_CALENDARIMPORTER_DEFAULT_TIMEZONE', "Europe/Vienna");
+	
+	/** Tempory path for uploaded files... */
+	define('PLUGIN_CALENDARIMPORTER_TMP_UPLOAD', "/var/lib/zarafa-webapp/tmp/");
 ?>