Commit Graph

4121 Commits

Author SHA1 Message Date
Eric Lippmann 0d4ed40cb2 CLI/Webserver Setup: Remove sapi stuff becuase it's nowhere used
refs #6120
2014-11-13 13:17:53 +01:00
Eric Lippmann 2ad2127ae3 Merge branch 'master' into feature/generate-webserver-config-6120
Conflicts:
	application/clicommands/SetupCommand.php
2014-11-13 12:50:55 +01:00
Alexander Fuhr 46df428e28 Add selection count hint in grids with help for hosts and services
refs #7654
2014-11-13 12:50:39 +01:00
Eric Lippmann 66975f0da5 Remove sample apache configuration
Our CLI will generate webserver configuration.
2014-11-13 10:56:08 +01:00
Eric Lippmann f097299534 Merge branch 'master' into feature/remove-autotools-files-7505 2014-11-13 10:52:40 +01:00
Eric Lippmann 385157be8f Zend: Remove require_once calls
refs #7464
2014-11-13 10:49:39 +01:00
Eric Lippmann 38ebc949a5 Zend: Include Zend version 1.12.9
refs #7464
2014-11-13 10:49:32 +01:00
Eric Lippmann f427577067 Add getVendorDir() in favor of constant ICINGAWEB_VENDORS 2014-11-13 09:38:04 +01:00
Eric Lippmann bfa834fc3b Remove constant ICINGAWEB_APPDIR
We should avoid use of constants.
2014-11-13 09:33:31 +01:00
Eric Lippmann 9c103a9864 Remove constant ICINGAWEB_BASEDIR
We should avoid use of constants.
2014-11-13 09:24:51 +01:00
Johannes Meyer 79bd743900 Add missing use statement for IcingaException in SetupException 2014-11-12 17:49:05 +01:00
Bernd Erk ac8cc0613c Merge branch 'master' into feature/redesign-7144
Conflicts:
	application/views/scripts/authentication/login.phtml
	public/css/icinga/login.less
2014-11-12 17:21:54 +01:00
Eric Lippmann 75475b1684 Rename getBootstrapDirecory() to getBootstrapDirectory() 2014-11-12 17:14:43 +01:00
Bernd Erk 68b598320b Fix module top padding 2014-11-12 17:14:30 +01:00
Johannes Meyer 5da82a3164 Move the servicegrid's navigation upwards instead of downwards 2014-11-12 17:13:23 +01:00
Alexander Fuhr b8113b688b Update User\Store\IniStoreTest 2014-11-12 17:13:15 +01:00
Alexander Fuhr 8bb318eb72 Update User\Store\DbStoreTest 2014-11-12 17:12:05 +01:00
Eric Lippmann c394cd0bff Use realpath in ApplicationBootstrap::getBootstrapDirecory()
If the CLI is called from source, the base directory is now set to the correct path.
Packagers will have to provide the path to the base directory though.
2014-11-12 17:11:48 +01:00
Johannes Meyer 4fa2340552 Merge branch 'feature/setup-wizard-7163'
resolves #7163
2014-11-12 17:05:32 +01:00
Johannes Meyer db7954c350 Merge branch 'master' into feature/setup-wizard-7163 2014-11-12 17:05:13 +01:00
Alexander Fuhr c7f36a5afa Fix empty preferences array warning in the DbStore 2014-11-12 17:03:22 +01:00
Eric Lippmann 79e4b9852b Do not try to detect the library path in icingacli
Packagers will use a custom icingacli.
2014-11-12 16:58:36 +01:00
Bernd Erk 288c52f88d Fix padding and moved h1 into control section 2014-11-12 16:56:04 +01:00
Bernd Erk 31f4fc6c63 Fix Plugin Output 2014-11-12 16:40:34 +01:00
Johannes Meyer 259a465f97 Show only the most important warning on the login page 2014-11-12 16:23:55 +01:00
Bernd Erk f2c4c3bb1b Fix color codes and badges 2014-11-12 16:19:00 +01:00
Johannes Meyer 2eb9a771c9 Do not check for any config file, just the directory to show the login-warning
refs #7163
2014-11-12 15:58:18 +01:00
Bernd Erk f456ad3a04 Fix for hovered host- and servicename 2014-11-12 15:53:12 +01:00
Eric Lippmann ec6b56a060 Allow to define Icinga Web 2's base directory while bootstrapping 2014-11-12 15:52:43 +01:00
Eric Lippmann 8b1419bb04 Do not try to detect the library path in index.php
Packagers will use a custom index.php.
2014-11-12 15:41:04 +01:00
Johannes Meyer 8e1a6a5b83 Fix that navigating in the service grid opens the grid in a new column
refs #6180
2014-11-12 15:13:32 +01:00
Johannes Meyer 933172f250 Replace navigation of the service matrix and rename it to service grid
fixes #6180
2014-11-12 15:07:01 +01:00
Eric Lippmann b27d1d0058 Merge branch 'master' into feature/setup-wizard-7163 2014-11-12 14:48:15 +01:00
Eric Lippmann a081db08a4 icingacli: Fix "Notice: Constant ICINGAWEB_BASEDIR already defined" 2014-11-12 14:43:58 +01:00
Eric Lippmann 6089372c42 Do not define ICINGAWEB_BASEDIR in index.php
There's SCRIPT_FILENAME. The constants will be removed shortly.
2014-11-12 14:39:45 +01:00
Eric Lippmann 826cfbeceb Fix include path to the Cli in icingacli 2014-11-12 13:48:26 +01:00
Alexander Fuhr 993390941a Add user account menu and move logout and preferences inside it 2014-11-12 13:22:14 +01:00
Alexander Fuhr 2bae33d6ad Change PreferenceForm and add the ability to store preferences in the current session 2014-11-12 13:18:35 +01:00
Eric Lippmann 277765ac72 No longer make ICINGAWEB_APPDIR configureable 2014-11-12 13:18:05 +01:00
Eric Lippmann 11e13582e2 Define the ICINGAWEB_VENDORS contant 2014-11-12 13:17:18 +01:00
Alexander Fuhr 4f84979c89 Fix IniStore to save and load proper user preferences 2014-11-12 13:16:09 +01:00
Eric Lippmann 921f324d3e Prepare icingacli for having the Icinga library in PHP's include path 2014-11-12 13:13:39 +01:00
Eric Lippmann 8c9465ffbd Fix ICINGAWEB_APPDIR location if the Icinga library is in PHP's include path 2014-11-12 13:06:43 +01:00
Eric Lippmann 32d483f69f Level up index.php
This is the preparation for having the Icinga library in PHP's include path.
2014-11-12 12:55:25 +01:00
Eric Lippmann 877e9101f3 Do not define the constant ICINGAWEB_LIBDIR
This constant should not be needed anywhere.
2014-11-12 12:55:16 +01:00
Alexander Fuhr 533d2207fd Fix `setupTimezone' and `setupInternationalization' for user preferences 2014-11-12 12:16:05 +01:00
Alexander Fuhr 8d120762de Add timezone detection to `setupTimezone' in ApplicationBootstrap 2014-11-12 12:13:46 +01:00
Alexander Fuhr 8d4e56a1fe Remove timezone element from the ApplicationConfigForm 2014-11-12 12:09:47 +01:00
Thomas Gelf f0ca81d7af Data\Filter: SORT_NATURAL only for PHP >= 5.4 2014-11-12 11:47:42 +01:00
Thomas Gelf 5851886877 Widget\Tab: no underlined space after icon 2014-11-12 11:30:06 +01:00