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

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

diff --cc WEB-INF/config.php.dist
index 5afca00d28d72fd1ac8ac01189dee6d4e8830fc9,5f7cf253b9312a01bffe78dddeaf58aa648adec5..cc3d0cd7bbe9d1e05f0e0d91dccf7adf9ba25acc
--- 1/WEB-INF/config.php.dist
--- 2/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.
  
 -define('NOTE_INPUT_HEIGHT', '40');
 +// 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');

diff --cc time.php
Simple merge