Eric Lippmann 1c74fd7028 Merge branch 'master' into feature/display-documentation-4820 ... Conflicts: modules/doc/library/Doc/DocParser.php		2014-08-19 13:39:48 +02:00
..
dashboard	Do not use height and width in bar charts, to avoid layout errors	2014-07-22 17:57:40 +02: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	doc/config: add menu.ini	2014-08-19 13:38:34 +02: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	Fix comment prefix in config/authentication.ini	2014-07-17 19:07:35 +02:00
config.ini.in	Make preferences INI path NOT be configurable	2014-06-24 15:46:39 +02:00
memberships.ini	Decouple authentication backend creation from Icinga\Authentication\Manager	2014-03-03 17:21:17 +01:00
menu.ini	Move "modules" to "System" menu	2014-08-19 11:14:18 +02:00
permissions.ini	Implement structures for permissions, restrictions and membership	2014-02-12 17:03:18 +01:00
resources.ini.in	Enable logging and make the file resource definition using the new log syntax	2014-04-30 09:10:23 +02:00
restrictions.ini	Restrictions for the 'support2' group affect icingaadmin	2014-03-10 01:34:13 +01:00