tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
icingaweb2/library/Icinga/Web/Controller
History
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
..
ActionController.php Throw IcingaException rather than Exception 2014-08-27 16:03:15 +02:00
BaseConfigController.php Adjust removeresource-action to suit the new resource form interface 2014-07-24 16:17:30 +02:00
BasePreferenceController.php Remove license headers from all files 2014-07-15 13:43:52 +02:00
ControllerTabCollector.php Remove license headers from all files 2014-07-15 13:43:52 +02:00
ModuleActionController.php Remove license headers from all files 2014-07-15 13:43:52 +02:00