Matthias Jentsch
7c1b11baa4
Fix a bug that causes a warning to be displayed when a section
...
declaration at line 0 is present
2013-08-14 15:05:10 +02:00
Matthias Jentsch
eecbc233b9
Fix behavior of PreservingIniWriter that caused comments at the line end to be deleted
...
Implement a function to fetch comments at line end and use it to preserve
comments. Change the regular expressions used to parse lines to be more aware
of whitespaces between terms. Add automatic value and comment indentation
to produce cleaner output.
2013-08-14 15:05:10 +02:00
Eric Lippmann
4585bf2555
CC: Add missing docstrings to DateTimeFactory and DateTimePicker
...
refs #4440
2013-08-12 17:27:23 +02:00
Eric Lippmann
bd140f2828
CC: Fix phpcs errors of files changed in feature/datetime-element-4440
...
refs #4440
2013-08-12 16:43:10 +02:00
Eric Lippmann
2c217d1d06
Framework/DateTime: No longer use the Unix timestamp format since this ignores the time zone
...
refs #4440
2013-08-12 16:43:10 +02:00
Eric Lippmann
9f22905837
Framework/DateTimePicker: Set element's value to Unix timestamp after the input is considered valid
...
refs #4440
2013-08-12 16:43:09 +02:00
Eric Lippmann
5cb9c67443
Framework: Fix Form's docstrings
...
refs #4440
2013-08-12 16:43:09 +02:00
Eric Lippmann
e95c604084
Framework: Fix typo in DateTimeFactory::setConfig
...
refs #4440
2013-08-12 16:43:09 +02:00
Eric Lippmann
b4b51b9d46
Framework: Implement time zone aware DateTimeFactory
...
refs #4440
2013-08-12 16:43:09 +02:00
Eric Lippmann
ba00fd39df
Framework: Get DateTimePicker's value as timestamp and add input validation
...
refs #4440
2013-08-12 16:43:09 +02:00
Eric Lippmann
3122a75e73
Framework/User: getTimeZone now returns a DateTimeZone object instead of a string
...
refs #4440
2013-08-12 16:43:09 +02:00
Eric Lippmann
da7f619804
Framework: Implement DateFormat view helper
...
Support date, time and datetime formatting based on format strings
set either by the user or via config.ini. The view helper
FormDateTime uses the new helper already
refs #4440
refs #4424
2013-08-12 16:43:09 +02:00
Eric Lippmann
1f10cb3124
Framework: Rename DateTime form element to DateTimePicker
...
refs #4440
2013-08-12 16:43:08 +02:00
Johannes Meyer
94ea09b552
Remove Date and Time form elements
...
Drops the Date and Time form element as they are redundant.
refs #4440
2013-08-12 16:43:08 +02:00
Eric Lippmann
c0e3712e1b
Framework/Elements: Implement DateTime form element
...
refs #4440
2013-08-12 16:42:51 +02:00
Eric Lippmann
8af901e9ed
Framework/User: Implement getTimezone to retrieve the user's Timezone
...
refs #4440
2013-08-12 16:42:50 +02:00
Eric Lippmann
9170523afa
Application/Bootstrap: Throw Exception if timezone isn't valid
...
refs #4440
2013-08-12 16:42:50 +02:00
Eric Lippmann
93ae6d6811
Framework: mv Icinga\Config\Config to Icinga\Application\Config
...
refs #4543
2013-08-12 15:02:25 +02:00
Jannis Moßhammer
07717e9119
Fix codestyle
...
- return self insteead of return $this
- missing licence header in Dimension.php
refs #4192
2013-08-09 10:32:57 +02:00
Jannis Moßhammer
886da7d0cb
Fix codestyle, change wrong 'dashboard' parameter to pane causing pane switching to fail
...
- Fixed concatenation
- Added license header where missing
- Fixed the index controller fetching the wrong parameter ('dashboard' instead of 'pane')
refs #4192
2013-08-08 17:42:34 +02:00
Jannis Moßhammer
6e68826da6
Fix PSR compliance of code
...
refs #4192
2013-08-07 18:10:39 +02:00
Jannis Moßhammer
488310df37
Fix style and docstrings, exception when removing the last tab
...
refs #4192
2013-08-07 17:45:09 +02:00
Jannis Moßhammer
2b25757e20
Add documentation, add errorhandling and sizing
...
The optional width/height parameter can be set in the ini to change the dashboard components
size, documentation has been added and in the error case a message with the configuration is shown
refs #4192
2013-08-07 17:44:30 +02:00
Jannis Moßhammer
f8bb478f0e
Update dashboard implementation
...
fix javascript naming (icinga-url to icingaurl), fix add form, add remove
button, code style changes
refs #4192
2013-08-07 17:43:37 +02:00
Jannis Moßhammer
b3e0d5e8ce
Remove AbstractWidget and make Widget an interface
...
As Widget's already denote an abstract concept, the name
'AbstractWidget' is redundant. Also this class didn't do anything except
fetching a view via a singleton (which is now injected into the render method)
and bypassing the PHP class properties by creating a 'properties' array which is
filled with magic getters and setters (which now are simply php class properties)
Further changes:
- toString is removed, as this incorporated a lot of
application logic which would cause unrecoverable
errors when throwing exceptions
- renderToHtml is now just render and the view dependency must be
passed, as a widget shouldn't be responsible for getting
view instance (this means that <?= $this->tabs ?> is now
<?= $this->tabs->render($this); ?> in the templates
- Controllers don't have $this->widget anymore as Widgets are
directly instanciated with their class, allowing better code completion
and avoiding hidden dependencies, also Widget::create is now removed
in favor of direct instanciation.
refs #4192
2013-08-07 17:41:43 +02:00
Matthias Jentsch
57257d1af3
Fix coding standard violations
...
resolves #4352
2013-08-07 16:19:15 +02:00
Matthias Jentsch
76d7753860
Split up functions in PreservingIniWriter for better readabillity and add better comment handling
...
Split up the function diffPropertyUpdates into two single functions. Change the
IniEditor to "glue" comments to section declarations.
resolves #4352
2013-08-07 15:58:51 +02:00
Matthias Jentsch
c1338898a6
Fix errors in function comments and move IniEditor into single class file
...
refs #4352
2013-08-07 15:58:51 +02:00
Matthias Jentsch
56e47fd084
Add an ini writer for configuration files
...
Add an ini writer that respects the file structure and the comments that may be
already present in the config file. Move Application/Config.php into
Config/Config.php.
refs #4352
2013-08-07 15:58:42 +02:00
Matthias Jentsch
edebbf93ab
Add an IniWriter that preserves the comments in already existing files
...
Add a function to create diffs between two object, add a
FileEditor to edit files line-by-line and add the class PropertyDiff to
describe a single property change.
refs #4352
2013-08-07 15:56:42 +02:00
Eric Lippmann
290c8c5225
CC: Add newline to end of file where missing
...
Following command was used:
$ find application/ library/Icinga/ modules/ -name *.php | xargs sed -i -e :a -e '/./,$!d;/^\n*$/{$d;N;};/\n$/ba;$a\'
2013-08-07 10:27:50 +02:00
Jannis Moßhammer
ff62a82895
Fix dynamic form validation behaviour, fix documentaion, fix correct isValid() call
...
- When a dynamic form is modified, no validation is performed, but
the form is being populated with $this->populate.
- changed parent::isValid to $this->isValid, otherwise no custom validation
logic could be implemented
- Updated documentation
- Fix CSRF protection by removing the time
refs #4439
2013-08-06 15:08:54 +02:00
Johannes Meyer
66592ecabf
Enable dynamic form elements
...
Expire time of the AcknowledgeForm and hours as well as
minutes of the ScheduleDowntimeForm are now dynamic.
refs #4439
2013-08-06 15:06:20 +02:00
Johannes Meyer
f5162189dd
Implement dynamic form elements
...
Rename "isPostAndValid" to "isSubmittedAndValid" and refactor it.
Add possibility for specific form elements to auto-submit their form.
refs #4439
2013-08-06 15:03:25 +02:00
Marius Hein
584198f00c
Fix hostlist test
...
refs #4516
2013-08-06 14:06:25 +02:00
Marius Hein
15999eb880
Change _forward to redirect() to keep url history updates
...
refs #4382
2013-08-06 13:39:10 +02:00
Johannes Meyer
4befc9be94
Merge branch 'feature/preferences-backend-4069'
...
resolves #4069
2013-08-06 12:04:16 +02:00
Johannes Meyer
5533b632ed
Fix code style and make form name non mandatory
...
refs #4439
2013-08-06 11:11:29 +02:00
Johannes Meyer
f26af0eb12
Update command form tests
...
Update command form tests so that they reflect the new dynamic
functionality and the correct purpose of "isSubmittedAndValid".
refs #4439
2013-08-06 11:11:28 +02:00
Johannes Meyer
8efbe6f613
Move submit and cancel handling
...
Move submit and cancel handling from ConfirmationForm to Form.
refs #4439
2013-08-06 11:11:28 +02:00
Johannes Meyer
fa7379adc7
Enable dynamic form elements
...
Expire time of the AcknowledgeForm and hours as well as
minutes of the ScheduleDowntimeForm are now dynamic.
refs #4439
2013-08-06 11:09:42 +02:00
Johannes Meyer
98e7ab02db
Implement dynamic form elements
...
Rename "isPostAndValid" to "isSubmittedAndValid" and refactor it.
Add possibility for specific form elements to auto-submit their form.
refs #4439
2013-08-06 11:09:42 +02:00
Marius Hein
c9c5e6ef3c
Send commands: Review fixes
...
refs #4441
2013-08-06 09:32:27 +02:00
Jannis Moßhammer
a58c933a29
Code style and comment fixes
...
refs #4441
2013-08-06 09:32:27 +02:00
Jannis Moßhammer
7675ea0514
Call commandhandler from commandcontroller actions
...
The CommandController now implements the calls to the specific
command methods and sends commands to the icinga process
refs #4441
2013-08-06 09:31:13 +02:00
Jannis Moßhammer
1894054929
Implement first commands, fix obsessing state
...
refs #4441
2013-08-06 09:30:25 +02:00
Jannis Moßhammer
4f1e6ec720
Code style and comment fixes
...
refs #4441
2013-08-06 09:27:37 +02:00
Jannis Moßhammer
b44de95caa
Call commandhandler from commandcontroller actions
...
The CommandController now implements the calls to the specific
command methods and sends commands to the icinga process
refs #4441
2013-08-06 09:27:37 +02:00
Jannis Moßhammer
2091f63c3b
Implement first commands, fix obsessing state
...
refs #4441
2013-08-06 09:27:37 +02:00
Jannis Moßhammer
d6bbed3a54
Extract the transport functions from the CommandPipe
...
- The CommandPipe class now delegates submission of commands to
the Transport classes (LocalPipe or SecureShell)
- Added SSH options for non-interactive mode
- Refactored tests
refs #4441
2013-08-06 09:27:37 +02:00
Marius Hein
512676ec1a
User preferences: Review fixes
...
refs #4069
2013-08-05 16:56:03 +02:00
Marius Hein
8f1a3b228b
User preferences: remove test code
...
refs #4096
2013-08-05 16:56:03 +02:00
Marius Hein
cc9b18376d
User preferences: Add doc, fix initial session write
...
refs #4069
2013-08-05 16:56:03 +02:00
Marius Hein
6112189b0c
User preferences: Add database store
...
refs #4069
2013-08-05 16:56:03 +02:00
Marius Hein
f3ed73175b
User preferences: Session store and glue to build instance
...
refs #4069
2013-08-05 16:56:02 +02:00
Marius Hein
6d1f349616
User preferences: Implement interfaces and ini store
...
refs #4069
2013-08-05 16:56:02 +02:00
Thomas Gelf
06fc3e395e
NO_ZERO_IN_DATE is available since MySQL 5.0.2
...
refs #4255
2013-08-02 15:10:09 +02:00
Jannis Moßhammer
5c3eb1d796
Style fixes and addParam test
...
refs #4381
2013-08-02 13:14:56 +02:00
Jannis Moßhammer
50ca1aec1a
Refactor URL class and test
...
The constructor of the class is now private, instantiation happens
with Url::fromRequest and Url::fromPath. Also updated all occurences
of Url and fixed the Qlink helper to not overwrite the baseUrl with null
values
refs #4381
2013-08-02 13:14:55 +02:00
Marius Hein
5ade338632
Fix wrong getter after renaming
...
refs #4066
2013-07-30 14:06:46 +02:00
Marius Hein
a1a8d4c157
Code compliance change and rename refs to User
...
refs #4066
2013-07-30 14:06:46 +02:00
Marius Hein
8510d57cf8
Prepare user settings api
...
Rework application bootstrap, move user object to its new location, implement web
request class to handle the user object.
refs #4066
2013-07-30 14:06:46 +02:00
Eric Lippmann
457f9b8f50
Db: Set MySQL server SQL modes to behave closer to ANSI SQL
...
refs #4413
2013-07-29 18:37:59 +02:00
Thomas Gelf
f2c6a66de7
Code cleanup, fixed and extended MySQL SQL_MODE
2013-07-29 13:24:25 +00:00
Matthias Jentsch
e51737f42a
Fix the installation manual, comments and give the unit-test functions a more
...
verbose name
refs #3769
2013-07-29 11:42:31 +02:00
Matthias Jentsch
94e9ffc7b3
Fix comments
...
refs #3769
2013-07-26 15:57:37 +02:00
Jannis Moßhammer
845654b77f
Fix strict error on ldap auth-fail, ldap is default auth now
...
refs #3769
refs #4463
2013-07-26 15:29:13 +02:00
Jannis Moßhammer
306a51271b
Change 'user' table to 'account', error handling and docs
...
Fix installation instructions for postgresql, the user table is now
'account', as user is a keyword in some rdbms, now catching exceptions
and returning auth failed while logging errors
refs #3769
2013-07-26 15:01:52 +02:00
Matthias Jentsch
ce95511890
Change default database to "icingaweb" and add installation instructions
...
Set the default database and user to "icingaweb" in the authentication.ini. Add
instructions about how to set up the databases to authentication.ini.
refs #3769
2013-07-26 13:10:00 +02:00
Matthias Jentsch
fd4cbf1c5b
Add default login to the authentication database
...
refs #3772
2013-07-26 13:10:00 +02:00
Matthias Jentsch
2807982f72
Remove crypto-module and use libraries instead
...
Remove the crypto-module to reduce amount of dependencies and use hash_hmac
with SHA256 instead.
refs #3769
2013-07-26 13:09:59 +02:00
Matthias Jentsch
3ff0c0f02a
Adds DbUserBackend to handle the authentication against a sql db.
...
Users should be able to authenticate against an internal DB without setting up
additional authentication domains.
refs #3769
2013-07-26 13:09:59 +02:00
Jannis Moßhammer
6900507ebc
Merge branch 'feature/command-masks-4355' of ssh://git.icinga.org/icinga2-web
2013-07-24 12:49:43 +02:00
Marius Hein
2b3bef457d
Command masks: Small PSR fix, drop unused core, fix lazy render
...
refs #4355
2013-07-24 12:43:26 +02:00
Jannis Moßhammer
ddfbf915ed
Implement isPostAndValid, fix CSRF in forms, update tests
...
Form provides isPostAndValid for validation, using the
request for fetching POST data.
The tests are now updated to use the CSRF protection and
are cleaner now
refs #4355
2013-07-24 10:56:41 +02:00
Marius Hein
849eee2cf2
Command masks: Review changes [WIP]
...
refs #4355
2013-07-23 17:09:06 +02:00
Jannis Mosshammer
e8204f4755
Merge branch 'feature/service-detail-view-4181' of ssh://git.icinga.org/icinga2-web
...
Conflicts:
library/Icinga/Application/Logger.php
library/Icinga/Application/Web.php
library/Icinga/Authentication/Backend/LdapUserBackend.php
library/Icinga/Authentication/Credentials.php
library/Icinga/Authentication/Manager.php
library/Icinga/Authentication/PhpSession.php
library/Icinga/Authentication/Session.php
library/Icinga/Authentication/User.php
library/Icinga/Authentication/UserBackend.php
library/Icinga/Backend/AbstractBackend.php
library/Icinga/Backend/DataView/ObjectRemappingView.php
library/Icinga/Backend/Query.php
library/Icinga/Backend/Statusdat/DataView/StatusdatHostView.php
library/Icinga/Backend/Statusdat/HostgroupsummaryQuery.php
library/Icinga/Backend/Statusdat/HostlistQuery.php
library/Icinga/Backend/Statusdat/ServicegroupsummaryQuery.php
library/Icinga/Backend/Statusdat/ServicelistQuery.php
library/Icinga/Exception/ConfigurationError.php
library/Icinga/Exception/MissingParameterException.php
library/Icinga/Exception/NotImplementedError.php
library/Icinga/Exception/ProgrammingError.php
library/Icinga/Exception/SystemPermissionException.php
library/Icinga/Protocol/AbstractQuery.php
library/Icinga/Protocol/Commandpipe/Acknowledgement.php
library/Icinga/Protocol/Commandpipe/CommandPipe.php
library/Icinga/Protocol/Commandpipe/Comment.php
library/Icinga/Protocol/Commandpipe/Downtime.php
library/Icinga/Protocol/Commandpipe/Exception/InvalidCommandException.php
library/Icinga/Protocol/Commandpipe/IComment.php
library/Icinga/Protocol/Commandpipe/PropertyModifier.php
library/Icinga/Protocol/Ldap/Connection.php
library/Icinga/Protocol/Ldap/Exception.php
library/Icinga/Protocol/Ldap/LdapUtils.php
library/Icinga/Protocol/Ldap/Node.php
library/Icinga/Protocol/Ldap/Query.php
library/Icinga/Protocol/Ldap/Root.php
library/Icinga/Protocol/Statusdat/Exception/ParsingException.php
library/Icinga/Protocol/Statusdat/IReader.php
library/Icinga/Protocol/Statusdat/ObjectContainer.php
library/Icinga/Protocol/Statusdat/Parser.php
library/Icinga/Protocol/Statusdat/Query.php
library/Icinga/Protocol/Statusdat/Query/Expression.php
library/Icinga/Protocol/Statusdat/Query/Group.php
library/Icinga/Protocol/Statusdat/Query/IQueryPart.php
library/Icinga/Protocol/Statusdat/Reader.php
library/Icinga/Protocol/Statusdat/RuntimeStateContainer.php
library/Icinga/Protocol/Statusdat/View/AccessorStrategy.php
library/Icinga/Web/ActionController.php
library/Icinga/Web/Form.php
library/Icinga/Web/Hook/Configuration/ConfigurationTab.php
library/Icinga/Web/Hook/Configuration/ConfigurationTabBuilder.php
library/Icinga/Web/Hook/Configuration/ConfigurationTabInterface.php
library/Icinga/Web/Hook/Grapher.php
library/Icinga/Web/Hook/Toptray.php
library/Icinga/Web/ModuleActionController.php
library/Icinga/Web/Notification.php
library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
library/Icinga/Web/Widget.php
modules/monitoring/application/views/helpers/MonitoringCommands.php
modules/monitoring/application/views/helpers/MonitoringFlags.php
modules/monitoring/application/views/helpers/MonitoringProperties.php
modules/monitoring/application/views/scripts/show/components/comments.phtml
modules/monitoring/application/views/scripts/show/components/downtime.phtml
modules/monitoring/application/views/scripts/show/components/flags.phtml
modules/monitoring/application/views/scripts/show/components/properties.phtml
modules/monitoring/application/views/scripts/show/header.phtml
modules/monitoring/application/views/scripts/show/host.phtml
modules/monitoring/application/views/scripts/show/service.phtml
modules/monitoring/library/Monitoring/Backend/AbstractBackend.php
modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
modules/monitoring/library/Monitoring/Backend/Statusdat.php
modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Order.php
modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/StatusdatServiceView.php
modules/monitoring/library/Monitoring/Backend/Statusdat/Query/GroupsummaryQuery.php
modules/monitoring/library/Monitoring/Backend/Statusdat/Query/Query.php
modules/monitoring/library/Monitoring/Command/Meta.php
modules/monitoring/library/Monitoring/View/DowntimeView.php
modules/monitoring/test/php/application/views/helpers/MonitoringCommandsTest.php
modules/monitoring/test/php/application/views/helpers/MonitoringPropertiesTest.php
modules/monitoring/test/php/library/Command/MetaTest.php
2013-07-23 16:33:07 +02:00
Marius Hein
89e7fa6b2d
Command masks: Add validator and change validation flow
...
refs #4355
2013-07-23 14:47:40 +02:00
Marius Hein
e9c9c9de87
Command masks: Fix lazy initialization of forms
...
refs #4355
2013-07-23 14:47:40 +02:00
Marius Hein
03f4a8eceb
Command masks: Implement missing forms [WIP]
...
Fixes phpcs issues, missing features, fix controller using
new config interface.
refs #4355
2013-07-23 14:47:40 +02:00
Marius Hein
0de38c25eb
Command masks: Refactor and implement masks
...
refs #4355
2013-07-23 14:47:40 +02:00
Marius Hein
d5b8a850ea
Forms: New form system
...
Move new form parts arround and add new LoginForm.
refs #4355
2013-07-23 14:46:26 +02:00
Marius Hein
dc878de275
Forms: Move class to the right place
...
Drop some methods we do not need anymore (all model related).
refs #4355
2013-07-23 14:46:25 +02:00
Marius Hein
2469e3652c
Forms: Drop old form class
2013-07-23 14:46:25 +02:00
Marius Hein
576124a827
Forms: Move Icinga\Form to Icinga\Web\Form
2013-07-23 14:46:25 +02:00
Johannes Meyer
b351cf61a7
Refactor Form-builder [WIP]
...
Refactor Form-builder so that it is an abstract extension class of
Zend_Form.
refs #4355
2013-07-23 14:46:25 +02:00
Johannes Meyer
56b8b398c2
Add Number functionality to Icinga\Form\SendCommand
2013-07-23 14:46:25 +02:00
Johannes Meyer
087e4dfe90
Add choice functionality to Icinga\Form\SendCommand
2013-07-23 14:46:25 +02:00
Johannes Meyer
23e15e3f54
Add textbox functionality to Icinga\Form\SendCommand
2013-07-23 14:46:25 +02:00
Johannes Meyer
4b8643dc56
Add a date and time form-element.
...
Added a date and time form-element which are implemented based on the
new "date" and "time" input-types introduced with html5. If those are not
available two bootstrap javascript-modules will be enabled.
refs #4355
2013-07-23 14:46:24 +02:00
Johannes Meyer
15ab7f188a
Implement schedule host/service check action
...
Refactored existing schedule action and fixed selectCommandTargets.
refs #4355
2013-07-23 14:46:24 +02:00
Johannes Meyer
aa241865b4
Replace custom formNote element with the one from Zend
...
Replaced custom form element "Note" as
Zend already provides such an element.
2013-07-23 14:46:24 +02:00
Johannes Meyer
abda65f4bd
Refactor command controller and implement restart action.
...
Refactored existing command controller so that it reflects the
correct coding style, rewritten the icinga restart command and
added a very simple form for it.
refs #4355
2013-07-23 14:46:24 +02:00
Marius Hein
8d3ff94696
Remove php strict errors
...
refs #4448
2013-07-23 12:18:27 +02:00
Jannis Moßhammer
a0839ea0da
Add service detail view
...
refs #4181
2013-07-22 16:03:36 +02:00
Jannis Moßhammer
dac9b7be4b
Fix mixedPagination property typo, Statusloader libraries missing and getter for Abstractquery
...
refs #4178
2013-07-19 17:48:24 +02:00
Jannis Moßhammer
5e4adcfea2
Add Service overview and fixes for Statusdat
...
The service overview required a few fixes for issues that
occured because the StatusDat Query class now inherits from
Data/AbstractQuery.
refs #4178
2013-07-19 17:45:51 +02:00
Jannis Moßhammer
5827cb37cb
Fix statusdat tests and implementation
...
After moving StatusDat to monitoring/Backends and changing the
inheritance to Library/Icinga/Data, a few changes must be reflected in the tests:
- Move tests to monitoring module
- Change $this->backend references in StatusDat Queries to $this->ds
- Added LibraryLoader to ease requiring of libaries (to be discussed)
refs #4417
refs #4179
2013-07-19 11:36:05 +02:00
Jannis Moßhammer
cea7cdbcaf
Move Statusdat to backend, remove old backend from library
...
Except for statusdat, the library/Icinga/Backend classes were unused
refs #4417
refs #4179
2013-07-18 17:20:12 +02:00
Jannis Moßhammer
c1860e7d5d
Merge branch 'master' of ssh://git.icinga.org/icinga2-web into feature/host-overview--4179
...
Conflicts:
modules/monitoring/application/controllers/ListController.php
modules/monitoring/application/controllers/ShowController.php
modules/monitoring/library/Monitoring/Backend/AbstractBackend.php
2013-07-15 13:52:26 +02:00