Thomas Gelf 57caacb93f Merge branch 'feature/fanzzzy-5481' into feature/master-1 ... Conflicts: application/controllers/AuthenticationController.php application/controllers/ErrorController.php application/views/scripts/authentication/login.phtml library/Icinga/Application/ApplicationBootstrap.php library/Icinga/Web/Controller/ActionController.php library/Icinga/Web/Hook.php library/Icinga/Web/Widget/Dashboard.php		2014-03-04 09:42:25 +00:00
..
AuthenticationController.php	Merge branch 'feature/fanzzzy-5481' into feature/master-1	2014-03-04 09:42:25 +00:00
ConfigController.php	Merge branch 'feature/fanzzzy-5481' into feature/master-1	2014-03-04 09:42:25 +00:00
DashboardController.php	Merge branch 'feature/fanzzzy-5481' into feature/master-1	2014-03-04 09:42:25 +00:00
ErrorController.php	Error controller needs no authentication	2014-02-21 14:03:48 +00:00
FilterController.php	Make IcingaWeb using the new log wrapper	2014-02-26 11:19:52 +01:00
IndexController.php	Re-add benchmark helper	2014-01-24 12:20:13 +01:00
LayoutController.php	Fix: Simplify TopBar hook	2014-02-12 09:58:59 +01:00
PreferenceController.php	Rework save preferences	2014-02-17 14:11:55 +01:00
SearchController.php	Add new global search to menu	2014-02-25 10:56:58 +00:00
StaticController.php	Merge branch 'feature/fanzzzy-5481' into feature/master-1	2014-03-04 09:42:25 +00:00