Eric Lippmann 54577d04bd Merge branch 'master' into bugfix/time-formatting-6778 ... Conflicts: modules/monitoring/application/views/scripts/list/comments.phtml modules/monitoring/application/views/scripts/list/hostgroups.phtml modules/monitoring/application/views/scripts/process/info.phtml modules/monitoring/application/views/scripts/show/components/downtime.phtml modules/monitoring/application/views/scripts/show/components/notifications.phtml modules/monitoring/public/css/module.less		2015-05-21 14:57:01 +02:00
..
Application	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
Chart	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
Data	Fix filter tests not taking whitespaces into account	2015-04-08 10:18:42 +02:00
File	Fix some spelling errors in comments and messages	2015-03-08 15:32:22 +01:00
Logger/Writer	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
Protocol/Ldap	Add unit tests for ldap connection behavior	2015-02-27 17:11:12 +01:00
Test	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
User	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
Util	Drop the DateTimeFactoryTest	2015-05-19 11:27:56 +02:00
Web	Drop the DateTimeRendererTest	2015-05-19 12:46:33 +02:00
UserTest.php	UserTest: Fix wrong assert condition for wildcard	2015-05-07 17:19:00 +02:00