Eric Lippmann aef81a56d6 Merge branch 'master' into feature/security-gui-5647 ...

Conflicts:
	library/Icinga/Application/Config.php
	library/Icinga/File/Ini/IniWriter.php
	library/Icinga/Web/Form.php
	library/Icinga/Web/Menu.php

2014-11-18 17:08:25 +01:00

..

Logger

Adjust usages of Icinga\Application\Config

2014-11-18 13:11:52 +01:00

Modules

Merge branch 'master' into feature/security-gui-5647

2014-11-18 17:08:25 +01:00

ApplicationBootstrap.php

Adjust usages of Icinga\Application\Config

2014-11-18 13:11:52 +01:00

Benchmark.php

Benchmark: hide timestamp on HTML output

2014-08-22 09:34:43 +02:00

Cli.php

Adjust usages of Icinga\Application\Config

2014-11-18 13:11:52 +01:00

Config.php

Split config functionality into two classes

2014-11-18 13:02:56 +01:00

EmbeddedWeb.php

EmbeddedWeb must not load core modules, i.e. setup

2014-11-15 01:04:56 +01:00

functions.php

Implement plural and context based translation functionality

2014-09-16 15:19:23 +02:00

Icinga.php

Remove license headers from all files

2014-07-15 13:43:52 +02:00

LegacyWeb.php

Remove license headers from all files

2014-07-15 13:43:52 +02:00

Loader.php

ProgrammingError: extend IcingaException

2014-08-26 11:15:19 +02:00

Logger.php

Adjust usages of Icinga\Application\Config

2014-11-18 13:11:52 +01:00

Platform.php

Do not hardcode the php username dummy in Icinga\Application\Platform

2014-11-07 14:40:28 +01:00

Web.php

Adjust usages of Icinga\Application\Config

2014-11-18 13:11:52 +01:00

webrouter.php

Remove license headers from all files

2014-07-15 13:43:52 +02:00