Bernd Erk
|
903219b302
|
Merge branch 'master' into feature/redesign-7144
Conflicts:
library/Icinga/Web/Menu.php
public/css/icinga/menu.less
|
2014-11-13 21:11:36 +01:00 |
|
Bernd Erk
|
20be45e8da
|
Enable icon font
|
2014-11-13 20:08:58 +01:00 |
|
Matthias Jentsch
|
0db5167a35
|
Fix event grid layout and forms
Make event grid horizontal, user build in form apply button, add linebreak between filter and grid
|
2014-11-13 18:40:13 +01:00 |
|
Matthias Jentsch
|
022d89254f
|
Fix tab, navigation and menu names
|
2014-11-13 18:38:42 +01:00 |
|
Eric Lippmann
|
f37e6fe21b
|
Merge branch 'master' into feature/remove-autotools-files-7505
|
2014-11-13 17:52:11 +01:00 |
|
Bernd Erk
|
6201858a68
|
Merge branch 'master' into feature/redesign-7144
|
2014-11-13 17:47:26 +01:00 |
|
Bernd Erk
|
205ba64781
|
Installer styling
|
2014-11-13 17:20:06 +01:00 |
|
Thomas Gelf
|
c68f9502ea
|
modules/doc: restructure menu
Moved first hierarchy into the menu, added font style link
refs #6936
|
2014-11-13 15:57:39 +01:00 |
|
Alexander Fuhr
|
dedb348af9
|
Add clickable icon for command check now 2
|
2014-11-13 15:55:25 +01:00 |
|
Thomas Gelf
|
3343599a63
|
doc/style: show web font icon set
refs #6936
|
2014-11-13 15:54:31 +01:00 |
|
Eric Lippmann
|
b52adcc2ab
|
Merge branch 'master' into feature/generate-webserver-config-6120
|
2014-11-13 15:09:34 +01:00 |
|
Bernd Erk
|
ef2ec0442c
|
Merge branch 'master' into feature/redesign-7144
|
2014-11-13 14:40:26 +01:00 |
|
Johannes Meyer
|
688c016f2d
|
Re-enable requirement checks for Zend_Db_Adapter_*
refs #7464
|
2014-11-13 14:34:31 +01:00 |
|
Johannes Meyer
|
4595b51318
|
Remove Zend version check
refs #7464
|
2014-11-13 14:34:04 +01:00 |
|
Alexander Fuhr
|
dc1960184d
|
Add hint in the grid if there are no active downtimes
|
2014-11-13 14:18:19 +01:00 |
|
Eric Lippmann
|
7c8e9e6f56
|
CLI/Webserver Setup: Rename webPath to urlPath
This is how the apache docs call it. Nginx speaks of uri.
refs #6120
|
2014-11-13 14:18:14 +01:00 |
|
Eric Lippmann
|
459fc77fc7
|
CLI/Webserver Setup: Allow to define Icinga Web 2's configuration directory
refs #6120
|
2014-11-13 14:05:13 +01:00 |
|
Alexander Fuhr
|
d0651e9e7f
|
Rename 'service current state' to 'service detail information' header
|
2014-11-13 14:04:23 +01:00 |
|
Eric Lippmann
|
0e64a8d573
|
CLI/Webserver Setup: Prefix URL paths with '/' if missing
refs #6120
|
2014-11-13 13:47:08 +01:00 |
|
Eric Lippmann
|
36d3c3e3d5
|
CLI/Webserver Setup: Don't print "# Your %s configuration"
I want to copy the config only.
refs #6120
|
2014-11-13 13:42:22 +01:00 |
|
Eric Lippmann
|
a0d4b6eee6
|
CLI/Webserver Setup: Don't use camelCase arguments
refs #6120
|
2014-11-13 13:40:39 +01:00 |
|
Eric Lippmann
|
e0f6ce36ea
|
CLI/Webserver Setup: Fix argument sanity checks
refs #6120
|
2014-11-13 13:30:07 +01:00 |
|
Eric Lippmann
|
8594dc068a
|
CLI/Webserver Setup: Rename publicPath to documentRoot
refs #6120
|
2014-11-13 13:17:59 +01:00 |
|
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
|
f097299534
|
Merge branch 'master' into feature/remove-autotools-files-7505
|
2014-11-13 10:52:40 +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 |
|
Bernd Erk
|
68b598320b
|
Fix module top padding
|
2014-11-12 17:14:30 +01:00 |
|
Johannes Meyer
|
db7954c350
|
Merge branch 'master' into feature/setup-wizard-7163
|
2014-11-12 17:05:13 +01:00 |
|
Bernd Erk
|
31f4fc6c63
|
Fix Plugin Output
|
2014-11-12 16:40:34 +01:00 |
|
Bernd Erk
|
f2c4c3bb1b
|
Fix color codes and badges
|
2014-11-12 16:19:00 +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 |
|
Johannes Meyer
|
7aae291f69
|
Merge branch 'master' into feature/setup-wizard-7163
|
2014-11-12 10:08:28 +01:00 |
|
Johannes Meyer
|
c3e28a42fb
|
Remove configuration option for setting the access mode on new files
|
2014-11-12 09:40:07 +01:00 |
|
Johannes Meyer
|
4992140326
|
Hardcode the access mode to use when creating files
refs #7163
|
2014-11-12 09:39:18 +01:00 |
|
Johannes Meyer
|
ca66480ba7
|
Hardcode the access mode to use when creating directories
refs #7163
|
2014-11-12 09:18:19 +01:00 |
|
Thomas Gelf
|
1cf32dd01d
|
test/php: add colorized testdox output for verbose
This shows all tests as a cute summary and marks failed and good ones
red and green.
|
2014-11-12 09:15:04 +01:00 |
|
Thomas Gelf
|
e5ac319cbb
|
helpers/MonitoringState: translate 'since'
|
2014-11-12 09:13:49 +01:00 |
|
Thomas Gelf
|
13d3b81728
|
monitoring/bin: remove obsolete file/directory
|
2014-11-12 00:21:20 +01:00 |
|
Thomas Gelf
|
f24b0e2a4e
|
MonitoringBackend: a few more places, doesn't hurt
|
2014-11-12 00:20:37 +01:00 |
|
Thomas Gelf
|
4876854893
|
Monitoring\ObjectList: expect a MonitoringObject
|
2014-11-12 00:16:07 +01:00 |
|
Thomas Gelf
|
e96ecc5271
|
LivestatusBackend: just an empty backend
|
2014-11-11 18:06:50 +01:00 |
|
Thomas Gelf
|
1ca83c001f
|
MonitoringBackend: just a few comments
fixes #7635
|
2014-11-11 17:33:31 +01:00 |
|
Thomas Gelf
|
78fd5109ac
|
MonitoringBackend: fix variable name in exception
refs #7635
|
2014-11-11 17:23:49 +01:00 |
|
Thomas Gelf
|
9431a3432f
|
MonitoringBackend: remove comment for SOLID fanboys
|
2014-11-11 17:21:32 +01:00 |
|
Thomas Gelf
|
8faf81dad5
|
MonitoringBackend: add clearInstances()
refs #7635
|
2014-11-11 16:57:34 +01:00 |
|
Thomas Gelf
|
6c0aa8dcc5
|
MonitoringBackend: handle null name in a nice way
When we get null as a backend name, we load the default one. While we
want to cache that null backend, it should still know about it's real
name.
|
2014-11-11 16:49:56 +01:00 |
|
Thomas Gelf
|
3f4110d33d
|
MonitoredObject: use MonitoringBackend::instance
refs #7635
|
2014-11-11 16:43:51 +01:00 |
|