Johannes Meyer fb5685bac3 Merge branch 'master' into bugfix/rebuild-form-builder-5525 ... Conflicts: application/forms/Config/Authentication/BaseBackendForm.php application/forms/Config/Authentication/DbBackendForm.php application/forms/Config/Authentication/LdapBackendForm.php application/forms/Config/Authentication/ReorderForm.php application/forms/Config/LoggingForm.php application/forms/Config/ResourceForm.php application/forms/Preference/GeneralForm.php library/Icinga/Application/Config.php library/Icinga/Web/Form.php modules/monitoring/application/controllers/ConfigController.php modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php modules/monitoring/application/forms/Config/SecurityForm.php		2014-08-29 16:05:56 +02:00
..
Backend	ContactQuery: Change timeperiod joins to joinLeft()	2014-08-28 13:39:49 +02:00
Cli	Remove license headers from all files	2014-07-15 13:43:52 +02:00
Command	Remove license headers from all files	2014-07-15 13:43:52 +02:00
DataView	Show/Contact: Add notification history to view	2014-08-27 16:38:29 +02:00
Exception	UnsupportedBackendException: extend IcingaException	2014-08-27 16:29:56 +02:00
Object	Monitoring\Object: fix a couple of cv-related issues	2014-08-20 13:36:03 +02:00
Plugin	monitoring/Perfdata: ignore invalid min/max	2014-07-31 16:52:34 +02:00
Timeline	Throw IcingaException rather than Exception	2014-08-27 16:03:15 +02:00
Web	Merge branch 'master' into bugfix/rebuild-form-builder-5525	2014-08-29 16:05:56 +02:00
Backend.php	ResourceConfig: Chance createResouce to create	2014-08-28 12:14:55 +02:00
Controller.php	Remove forgotten coding standards annotation	2014-07-16 13:59:43 +02:00
Environment.php	Remove license headers from all files	2014-07-15 13:43:52 +02:00
Plugin.php	Remove license headers from all files	2014-07-15 13:43:52 +02:00