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

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

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

Authentication

Require the OpenSSL module instead of providing an unsafe fallback

2014-11-11 10:19:09 +01:00

Chart

Fix disappearing tooltips on SVG reload

2014-09-08 16:23:14 +02:00

Cli

Remove constant ICINGAWEB_APPDIR

2014-11-13 09:33:31 +01:00

Data

Add existing GROUPBYs to count queries

2014-11-13 16:42:11 +01:00

Exception

Move the setup wizard code to a dedicated module

2014-11-10 15:11:44 +01:00

File

Rename getBootstrapDirecory() to getBootstrapDirectory()

2014-11-12 17:14:43 +01:00

Protocol

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

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

Test

Prefer Icinga\Application\Config instead of Zend_Config

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

User

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

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

Util

Util\Translator: available locales should be sorted

2014-11-11 19:45:56 +01:00

Web

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

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

User.php

Avoid type warning when using array_combine on empty arrays

2014-09-30 15:54:38 +02:00