Merges an updated upstream from main.

[timetracker.git] / WEB-INF / config.php.dist

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 25ba2c0..b52e0d8 100644 (file)
--- 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);