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
..
Application	Quickfix to get master-1 running	2014-03-04 09:31:17 +00:00
Authentication	Merge branch 'feature/installation-and-configuration-cleanup-5638'	2014-03-03 19:03:39 +01:00
Chart	Remove echo instruction from Icinga\Chart\Palette	2014-02-21 14:20:54 +01:00
Cli	Fix coding style	2014-02-21 14:07:32 +01:00
Config	Add configuration for resources	2013-11-13 18:12:00 +01:00
Data	Merge branch 'feature/installation-and-configuration-cleanup-5638'	2014-03-03 19:03:39 +01:00
Exception	Decouple (automatic) preferences storage from user preferences (WIP)	2014-02-14 17:28:11 +01:00
File	Don't do automagic PDF pagination per default	2014-02-21 14:05:27 +00:00
Filter	Fix coding style	2014-02-21 14:07:32 +01:00
Logger	Add stream writer	2014-02-26 13:47:16 +01:00
Protocol	Merge branch 'feature/installation-and-configuration-cleanup-5638'	2014-03-03 19:03:39 +01:00
Session	Refresh session id on Authentication	2014-02-26 19:23:34 +01:00
Test	Decouple (automatic) preferences storage from user preferences (WIP)	2014-02-14 17:28:11 +01:00
User	Merge branch 'feature/installation-and-configuration-cleanup-5638'	2014-03-03 19:03:39 +01:00
Util	Merge branch 'feature/fanzzzy-5481' into feature/master-1	2014-03-04 09:42:25 +00:00
Web	Merge branch 'feature/fanzzzy-5481' into feature/master-1	2014-03-04 09:42:25 +00:00
User.php	Implement structures for permissions, restrictions and membership	2014-02-12 17:03:18 +01:00