icingaweb2/library/Icinga/Web/Controller
Johannes Meyer bb7972aa39 Merge branch 'master' into bugfix/rebuild-form-builder-5525
Conflicts:
	application/controllers/AuthenticationController.php
	application/controllers/ConfigController.php
	application/forms/Authentication/LoginForm.php
	application/forms/Preference/GeneralForm.php
	modules/monitoring/application/controllers/ChartController.php
2014-08-20 13:13:50 +02:00
..
ActionController.php ActionController: remove redirectToLogin default 2014-08-19 12:28:24 +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