From: Nik Okuntseff <support@anuko.com>
Date: Mon, 18 Jul 2016 18:16:52 +0000 (+0000)
Subject: Merge branch 'taskChanges' of https://github.com/avidenic/timetracker into avidenic... 
X-Git-Tag: timetracker_1.19-1~1700^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ba0b5f34efabfeded3112115086eaa9d00f2a345;p=timetracker.git

Merge branch 'taskChanges' of https://github.com/avidenic/timetracker into avidenic-taskChanges

Conflicts:
	.gitignore
	WEB-INF/config.php.dist
---

ba0b5f34efabfeded3112115086eaa9d00f2a345
diff --cc WEB-INF/config.php.dist
index 5afca00d,5f7cf253..cc3d0cd7
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@@ -215,6 -215,5 +215,9 @@@ define('AUTH_MODULE', 'db')
  
  // 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 manager can set monthly quota for years between these values:
 +define('MONTHLY_QUOTA_YEARS_START', 2010); // if nothing is specified, it falls back to 2010
 +define('MONTHLY_QUOTA_YEARS_END', 2031); // if nothing is specified it falls back to 2030
++
+ // note input height in time.php
 -define('NOTE_INPUT_HEIGHT', '40');
++define('NOTE_INPUT_HEIGHT', '40');