Matthias Jentsch
|
25f397042b
|
Merge branch 'master' into feature/improve-multi-select-view-8565
Conflicts:
modules/monitoring/application/controllers/HostsController.php
modules/monitoring/application/controllers/ServicesController.php
modules/monitoring/application/views/scripts/hosts/show.phtml
modules/monitoring/application/views/scripts/list/hosts.phtml
modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
modules/monitoring/application/views/scripts/services/show.phtml
modules/monitoring/public/css/module.less
public/js/icinga/behavior/tooltip.js
|
2015-05-11 13:28:43 +02:00 |
|
Matthias Jentsch
|
46da404452
|
Add docstrings to ObjectList and coding style
|
2015-04-07 16:34:20 +02:00 |
|
Eric Lippmann
|
d8d0d88c95
|
Rename Capability::hasStartTLS to Capability::hasStartTls()
|
2015-03-13 00:29:00 +01:00 |
|
Matthias Jentsch
|
65821863fa
|
Don't crash on single ldap capability entries
refs #8490
|
2015-02-27 17:10:21 +01:00 |
|
Matthias Jentsch
|
e93a5f16d9
|
Move capability-related code of the ldap connection into a separate class
Achieve a better separation between the different concerns, more readable code and get rid of unused dead code.
|
2015-02-27 17:10:21 +01:00 |
|