Eric Lippmann 07d04628cf Merge branch 'feature/installation-and-configuration-cleanup-5638' ...

Conflicts:
	config/config.ini.in
	library/Icinga/Application/ApplicationBootstrap.php
	library/Icinga/Application/Cli.php
	library/Icinga/Application/EmbeddedWeb.php
	library/Icinga/Application/Logger.php
	library/Icinga/Application/Modules/Manager.php
	library/Icinga/Application/Web.php
	library/Icinga/Authentication/Backend/DbUserBackend.php
	library/Icinga/Authentication/Manager.php
	library/Icinga/User/Preferences/IniStore.php
	test/php/library/Icinga/Application/LoggerTest.php

2014-03-03 19:03:39 +01:00

..

dashboard

Fix layout of GridChart

2014-02-18 18:44:42 +01:00

enabledModules

Add additional resources

2013-06-03 17:05:59 +02:00

ldap

Add additional resources

2013-06-03 17:05:59 +02:00

modules/monitoring

Merge branch 'feature/installation-and-configuration-cleanup-5638'

2014-03-03 19:03:39 +01:00

preferences

Preferences: Fix error messages and convenience configuration

2013-08-29 14:45:02 +02:00

ssl/cacerts

Add additional resources

2013-06-03 17:05:59 +02:00

.gitignore

Add --with-icingaweb-log-path.

2013-10-22 10:57:15 +02:00

authentication.ini.in

Decouple authentication backend creation from Icinga\Authentication\Manager

2014-03-03 17:21:17 +01:00

config.ini.in

Merge branch 'feature/installation-and-configuration-cleanup-5638'

2014-03-03 19:03:39 +01:00

memberships.ini

Decouple authentication backend creation from Icinga\Authentication\Manager

2014-03-03 17:21:17 +01:00

menu.ini

Fixed executable flags on normal files.

2014-02-18 09:42:13 +01:00

permissions.ini

Implement structures for permissions, restrictions and membership

2014-02-12 17:03:18 +01:00

resources.ini.in

Fixed executable flags on normal files.

2014-02-18 09:42:13 +01:00

restrictions.ini

Implement structures for permissions, restrictions and membership

2014-02-12 17:03:18 +01:00