X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Fconfig.php.dist;h=9f53f9dff8daeaa74836302f9deeeacc5447c4ce;hb=5fdf8659516ad2b07458deba8eda234e8e07c554;hp=25ba2c0d36f5620d98032b7852dcad1b77467e5b;hpb=029e1daa627ad332edd64bba79f5415fcaf1407d;p=timetracker.git

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 25ba2c0d..9f53f9df 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -86,11 +86,17 @@ define('COST_ON_REPORTS', true);
 //
 // define('READONLY_START_FINISH', false);
 
+
 // FUTURE_ENTRIES - defines whether users can create entries for future dates. Defaults to true.
 //
 // define('FUTURE_ENTRIES', false);
 
 
+// ALLOW_OVERLAP - defines whether overlapping time entries are allowed. Defaults to false.
+//
+// define('ALLOW_OVERLAP', true);
+
+
 // WEEKEND_START_DAY
 //
 // This option defines which days are highlighted with weekend color.
@@ -168,7 +174,7 @@ define('LANG_DEFAULT', '');
 define('CURRENCY_DEFAULT', '$');
 
 
-// EXPORT_DECIMAL_DURATION - defines whether time duration values are decimal in CSV and XML data exports (1.25 vs 1:15).
+// EXPORT_DECIMAL_DURATION - defines whether time duration values are decimal in CSV and XML data exports (1.25 or 1,25 vs 1:15).
 // 
 define('EXPORT_DECIMAL_DURATION', true);
 
@@ -208,3 +214,11 @@ define('AUTH_MODULE', 'db');
 //  'member_of' => array());            // List of groups, membership in which is required for user to be authenticated.
 
 // define('AUTH_DEBUG', false); // Note: enabling AUTH_DEBUG breaks redirects as debug output is printed before setting redirect header. Do not enable on production systems.
+
+
+// Team managers can set monthly work hour quota for years between the following  values.
+// define('MONTHLY_QUOTA_YEAR_START', 2010); // If nothing is specified, it falls back to 2015.
+// define('MONTHLY_QUOTA_YEAR_END', 2025);   // If nothing is specified, it falls back to 2030.
+
+// Height in pixels for the note input field in time.php. Defaults to 40.
+// define('NOTE_INPUT_HEIGHT', 100);