Eric Lippmann ac2ec83852 Merge branch 'master' into feature/localization-form-6073 ...

Conflicts:
	library/Icinga/Application/ApplicationBootstrap.php
	test/php/library/Icinga/User/Store/DbStoreTest.php

2014-11-13 17:03:41 +01:00

..

Application

Fix that Config::fromSection cannot return the actual value

2014-11-11 15:51:54 +01:00

Chart

GraphChartTest: match current implementation

2014-09-04 17:57:02 +02:00

Data

filter: Fix whitepsace sanitation when expression is an array

2014-10-01 04:00:43 +02:00

File

Do not normalize configuration keys to nested arrays in IniWriter

2014-11-11 15:05:34 +01:00

Logger/Writer

Prefer Icinga\Application\Config instead of Zend_Config

2014-11-07 13:53:03 +01:00

Protocol/Ldap

Prefer Icinga\Application\Config instead of Zend_Config

2014-11-07 13:53:03 +01:00

Test

Data\Db: rename Query and Connection to Db...

2014-06-06 06:43:13 +00:00

User

Merge branch 'master' into feature/localization-form-6073

2014-11-13 17:03:41 +01:00

Util

Extend TranslatorTest with new tests

2014-09-16 16:14:07 +02:00

Web

Merge branch 'master' into feature/setup-wizard-7163

2014-11-11 09:44:11 +01:00

UserTest.php

Introduce `User::can()' for checking whether a user has a given permission

2014-09-18 14:37:18 +02:00