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
..
ChartController.php	Merge branch 'master' into bugfix/rebuild-form-builder-5525	2014-08-29 16:05:56 +02:00
CommandController.php	Throw IcingaException rather than Exception	2014-08-27 16:03:15 +02:00
ConfigController.php	Merge branch 'master' into bugfix/rebuild-form-builder-5525	2014-08-29 16:05:56 +02:00
ListController.php	list/hosts: add missing host_attempt column	2014-08-22 05:23:45 -04:00
MonitoringCommands.php	Remove leading backslashes from the targets of use statements	2014-08-27 15:51:49 +02:00
MultiController.php	Merge branch 'master' into bugfix/rebuild-form-builder-5525	2014-08-20 13:13:50 +02:00
ProcessController.php	Remove license headers from all files	2014-07-15 13:43:52 +02:00
ShowController.php	Show/Contact: Add notification history to view	2014-08-27 16:38:29 +02:00
TacticalController.php	monitoring/tactical: fix missing translations	2014-08-22 18:08:20 +02:00
TimelineController.php	Remove leading backslashes from the targets of use statements	2014-08-27 15:51:49 +02:00