Thomas Gelf 3462f0ee9a Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361 ... Conflicts: modules/monitoring/application/views/scripts/host/history.phtml modules/monitoring/application/views/scripts/list/services.phtml		2015-06-18 11:26:51 +02:00
..
Application	IIS: use 'config' folder within icingaweb root instead of '/etc/icingaweb2' on Windows	2015-06-12 14:46:00 +02:00
Authentication	Allow to configure user group backends of type LDAP	2015-06-05 14:53:29 +02:00
Chart	lib/chart: Use PHP's DateTime instead of our DateTimeFactory	2015-05-19 11:10:35 +02:00
Cli	Add support for command line arguments in the format --arg=<value>	2015-06-10 17:19:49 +02:00
Data	Merge branch 'master' into feature/user-and-group-management-8826	2015-06-02 14:54:13 +02:00
Date	lib: Add DateFormatter::formatDuration()	2015-05-22 09:49:06 +02:00
Exception	Merge branch 'master' into feature/user-and-group-management-8826	2015-05-22 10:06:31 +02:00
File	Fix key and value sanitazion in ini writer	2015-06-08 13:11:40 +02:00
Protocol	Ldap\Connection: Disable server side sorting as it's not working	2015-06-03 14:24:48 +02:00
Repository	LdapRepository: Add normed attribute `gid'	2015-06-03 16:08:29 +02:00
Security	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
Test	Don't setup the DateTimeFactory in our tests	2015-05-19 11:25:06 +02:00
User	Fix that preferences can't be stored in a database	2015-03-08 10:19:17 +01:00
Util	Merge branch 'feature/ssh-remote-connection-resource-configuration-7595'	2015-06-15 17:30:42 +02:00
Web	Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361	2015-06-18 11:26:51 +02:00
User.php	User: Consider the required permission more important if it has a wildcard	2015-06-02 12:01:02 +02:00