[Pkg-nagios-changes] [pkg-icingaweb2] branch ubuntu updated (eda1b91 -> 8cc846f)
Alexander Wirt
formorer at debian.org
Mon Nov 16 15:40:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
formorer pushed a change to branch ubuntu
in repository pkg-icingaweb2.
from eda1b91 Merge branch 'master' into ubuntu
adds 58169fb Imported Upstream version 2.1.0
adds 4ce627e Merge tag 'upstream/2.1.0'
adds f65e92d Add iframe module
adds 96ca3e9 Changelog for 2.1.0-1
new 8cc846f Merge branch 'master' into ubuntu
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
ChangeLog | 247 ++
VERSION | 2 +-
application/VERSION | 2 +-
.../controllers/ApplicationStateController.php | 39 +
application/controllers/ConfigController.php | 6 -
application/controllers/DashboardController.php | 8 -
application/controllers/GroupController.php | 11 +-
application/controllers/NavigationController.php | 2 +-
application/controllers/RoleController.php | 2 -
application/controllers/UserController.php | 11 +-
application/fonts/fontello-ifont/config.json | 6 +
.../fonts/fontello-ifont/css/ifont-codes.css | 3 +-
.../fonts/fontello-ifont/css/ifont-embedded.css | 15 +-
.../fonts/fontello-ifont/css/ifont-ie7-codes.css | 3 +-
application/fonts/fontello-ifont/css/ifont-ie7.css | 3 +-
application/fonts/fontello-ifont/css/ifont.css | 15 +-
application/fonts/fontello-ifont/demo.html | 13 +-
application/forms/Authentication/LoginForm.php | 2 +-
application/forms/Config/GeneralConfigForm.php | 40 -
application/forms/Config/ResourceConfigForm.php | 4 +-
application/forms/ConfigForm.php | 42 +
application/forms/Control/LimiterControlForm.php | 113 +
application/forms/Dashboard/DashletForm.php | 4 +-
application/forms/PreferenceForm.php | 1 -
application/locale/de_DE/LC_MESSAGES/icinga.mo | Bin 11693 -> 59490 bytes
application/locale/de_DE/LC_MESSAGES/icinga.po | 1265 +++----
application/locale/it_IT/LC_MESSAGES/icinga.mo | Bin 31334 -> 56908 bytes
application/locale/it_IT/LC_MESSAGES/icinga.po | 2756 ++++++++--------
.../locale/{de_DE => ru_RU}/LC_MESSAGES/icinga.po | 958 ++----
application/views/scripts/about/index.phtml | 27 +-
.../views/scripts/application-state/index.phtml | 0
.../views/scripts/authentication/login.phtml | 9 +
application/views/scripts/config/modules.phtml | 58 +-
application/views/scripts/config/resource.phtml | 2 +-
.../views/scripts/form/reorder-authbackend.phtml | 2 +-
application/views/scripts/group/list.phtml | 132 +-
application/views/scripts/group/show.phtml | 143 +-
.../views/scripts/list/applicationlog.phtml | 50 +-
application/views/scripts/mixedPagination.phtml | 10 +-
application/views/scripts/navigation/index.phtml | 16 +-
application/views/scripts/navigation/shared.phtml | 17 +-
application/views/scripts/role/list.phtml | 2 +-
application/views/scripts/user/list.phtml | 50 +-
application/views/scripts/user/show.phtml | 153 +-
.../views/scripts/usergroupbackend/list.phtml | 2 +-
debian/changelog | 12 +
debian/icingaweb2.install | 1 +
doc/installation.md | 24 +-
doc/vagrant.md | 7 +-
icingaweb2.spec | 7 +-
.../Icinga/Application/ApplicationBootstrap.php | 15 +-
library/Icinga/Application/ClassLoader.php | 241 +-
library/Icinga/{Web => Application}/Hook.php | 50 +-
.../{Web => Application}/Hook/GrapherHook.php | 2 +-
.../{Web => Application}/Hook/TicketHook.php | 2 +-
.../{Web => Application}/Hook/WebBaseHook.php | 2 +-
library/Icinga/Application/Logger.php | 14 +-
library/Icinga/Application/Modules/Manager.php | 29 +-
library/Icinga/Application/Modules/Module.php | 96 +-
library/Icinga/Application/Version.php | 2 +-
library/Icinga/Application/Web.php | 94 +-
library/Icinga/Authentication/Auth.php | 11 +
.../Icinga/Authentication/User/DbUserBackend.php | 2 +
.../Icinga/Authentication/User/LdapUserBackend.php | 83 +-
.../UserGroup/DbUserGroupBackend.php | 14 +-
.../UserGroup/LdapUserGroupBackend.php | 175 +-
.../UserGroup/UserGroupBackendInterface.php | 9 +
library/Icinga/Cli/Command.php | 6 +-
library/Icinga/Data/Db/DbConnection.php | 1 +
library/Icinga/Data/Db/DbQuery.php | 22 +-
library/Icinga/Data/Filter/FilterChain.php | 19 +-
library/Icinga/Data/Filter/FilterExpression.php | 24 +-
library/Icinga/Data/PivotTable.php | 14 +-
library/Icinga/Protocol/Ldap/Expression.php | 30 -
library/Icinga/Protocol/Ldap/LdapCapabilities.php | 8 +-
library/Icinga/Protocol/Ldap/LdapConnection.php | 333 +-
library/Icinga/Protocol/Ldap/LdapQuery.php | 107 +-
library/Icinga/Repository/DbRepository.php | 263 +-
library/Icinga/Repository/LdapRepository.php | 23 +-
library/Icinga/Repository/Repository.php | 57 +-
library/Icinga/Repository/RepositoryQuery.php | 85 +-
.../Icinga/{Application => Test}/ClassLoader.php | 10 +-
library/Icinga/Web/Controller.php | 37 +-
library/Icinga/Web/Controller/Dispatcher.php | 3 +-
library/Icinga/Web/Form.php | 7 +-
library/Icinga/Web/Form/Decorator/FormHints.php | 2 +-
library/Icinga/Web/Hook.php | 210 +-
library/Icinga/Web/Hook/GrapherHook.php | 106 +-
library/Icinga/Web/Hook/TicketHook.php | 119 +-
library/Icinga/Web/JavaScript.php | 1 +
.../Renderer/BadgeNavigationItemRenderer.php | 19 +-
.../Renderer/LogoutNavigationItemRenderer.php | 14 -
.../Web/Navigation/Renderer/NavigationRenderer.php | 9 +-
.../Renderer/RecursiveNavigationRenderer.php | 11 +-
.../Renderer/UserNavigationItemRenderer.php | 26 -
library/Icinga/Web/StyleSheet.php | 9 +-
library/Icinga/Web/UrlParams.php | 2 +-
library/Icinga/Web/View/helpers/format.php | 6 +-
library/Icinga/Web/View/helpers/url.php | 5 +-
library/Icinga/Web/Widget/Chart/InlinePie.php | 2 +-
library/Icinga/Web/Widget/Limiter.php | 74 +-
library/Icinga/Web/Widget/SortBox.php | 53 +-
.../Web/Widget/Tabextension/DashboardSettings.php | 2 +-
.../doc/application/views/scripts/chapter.phtml | 2 +-
.../application/views/scripts/module/index.phtml | 3 +-
.../application/views/scripts/style/guide.phtml | 2 +-
.../doc/library/Doc/Renderer/DocTocRenderer.php | 4 +-
modules/doc/module.info | 2 +-
modules/doc/public/css/module.less | 4 +
modules/doc/public/js/module.js | 29 +
modules/iframe/{moduel.info => module.info} | 2 +-
.../application/controllers/ConfigController.php | 2 +-
.../application/controllers/HostsController.php | 46 +-
.../application/controllers/ListController.php | 7 +-
.../application/controllers/ServicesController.php | 59 +-
.../application/forms/Config/BackendConfigForm.php | 2 +-
.../application/forms/Navigation/ActionForm.php | 4 +
.../locale/de_DE/LC_MESSAGES/monitoring.mo | Bin 13226 -> 75291 bytes
.../locale/de_DE/LC_MESSAGES/monitoring.po | 2555 ++++++---------
.../locale/it_IT/LC_MESSAGES/monitoring.mo | Bin 51851 -> 82241 bytes
.../locale/it_IT/LC_MESSAGES/monitoring.po | 3466 ++++++++++----------
.../{de_DE => ru_RU}/LC_MESSAGES/monitoring.po | 2541 ++++++--------
.../monitoring/application/views/helpers/Link.php | 2 +-
.../application/views/helpers/Perfdata.php | 10 +-
.../application/views/helpers/PluginOutput.php | 11 +-
.../application/views/scripts/config/index.phtml | 12 +-
.../application/views/scripts/host/history.phtml | 166 -
.../application/views/scripts/list/comments.phtml | 6 +-
.../scripts/list/components/hostssummary.phtml | 28 +-
.../scripts/list/components/selectioninfo.phtml | 15 +-
.../scripts/list/components/servicesummary.phtml | 26 +-
.../views/scripts/list/contactgroups.phtml | 6 +-
.../application/views/scripts/list/contacts.phtml | 6 +-
.../application/views/scripts/list/downtimes.phtml | 7 +-
.../views/scripts/list/eventhistory.phtml | 145 +-
.../views/scripts/list/hostgroups.phtml | 6 +-
.../application/views/scripts/list/hosts.phtml | 106 +-
.../views/scripts/list/notifications.phtml | 78 +-
.../views/scripts/list/servicegrid.phtml | 84 +-
.../views/scripts/list/servicegroups.phtml | 6 +-
.../application/views/scripts/list/services.phtml | 88 +-
.../views/scripts/object/detail-history.phtml | 13 +
.../partials/comment/comment-description.phtml | 2 +-
.../scripts/partials/comment/comment-detail.phtml | 46 +-
.../scripts/partials/comment/comment-header.phtml | 2 +-
.../scripts/partials/comment/comments-header.phtml | 4 +-
.../partials/downtime/downtime-header.phtml | 52 +-
.../views/scripts/partials/event-history.phtml | 179 +
.../scripts/partials/host/objects-header.phtml | 81 +-
.../scripts/partials/object/host-header.phtml | 48 +-
.../scripts/partials/object/service-header.phtml | 64 +-
.../scripts/partials/service/objects-header.phtml | 81 +-
.../views/scripts/service/history.phtml | 150 -
.../scripts/show/components/acknowledgement.phtml | 153 +-
.../scripts/show/components/checksource.phtml | 24 +-
.../views/scripts/show/components/comments.phtml | 50 +-
.../views/scripts/show/components/downtime.phtml | 56 +-
.../views/scripts/show/components/output.phtml | 8 +-
.../scripts/tactical/components/ok_hosts.phtml | 1 -
.../tactical/components/problem_hosts.phtml | 1 -
.../application/views/scripts/tactical/index.phtml | 2 -
modules/monitoring/configuration.php | 1 -
.../Ido/Query/HostserviceproblemsummaryQuery.php | 2 +-
.../Monitoring/Backend/Ido/Query/IdoQuery.php | 366 ++-
.../Ido/Query/ServicecommenthistoryQuery.php | 2 +-
.../Backend/Ido/Query/ServicestatusQuery.php | 28 +-
.../library/Monitoring/DataView/DataView.php | 13 +
.../library/Monitoring/DataView/Hoststatus.php | 5 +-
.../library/Monitoring/DataView/Servicestatus.php | 6 +-
.../Monitoring/Hook/DataviewExtensionHook.php | 20 +
.../Monitoring/{Web => }/Hook/HostActionsHook.php | 2 +-
.../Monitoring/Hook/IdoQueryExtensionHook.php | 15 +
.../{Web => }/Hook/ServiceActionsHook.php | 2 +-
.../{Web => }/Hook/TimelineProviderHook.php | 2 +-
.../monitoring/library/Monitoring/Object/Macro.php | 14 +-
.../library/Monitoring/Object/MonitoredObject.php | 214 +-
.../library/Monitoring/Object/Service.php | 2 +
.../library/Monitoring/Plugin/Perfdata.php | 1 -
.../Web/Controller/MonitoredObjectController.php | 5 +-
.../Monitoring/Web/Hook/HostActionsHook.php | 43 +-
.../Monitoring/Web/Hook/ServiceActionsHook.php | 43 +-
.../Monitoring/Web/Hook/TimelineProviderHook.php | 34 +-
.../library/Monitoring/Web/Navigation/Action.php | 2 +-
modules/monitoring/module.info | 2 +-
modules/monitoring/public/css/module.less | 116 +-
modules/monitoring/public/css/plugin-output.less | 11 -
modules/monitoring/public/css/service-grid.less | 10 +-
modules/monitoring/public/css/tables.less | 170 +-
.../php/library/Monitoring/Object/MacroTest.php | 32 +-
modules/setup/module.info | 2 +-
modules/test/module.info | 2 +-
modules/translation/module.info | 2 +-
public/css/icinga/about.less | 32 +
public/css/icinga/badges.less | 26 +-
public/css/icinga/base.less | 142 +-
public/css/icinga/colors.less | 12 -
public/css/icinga/compat.less | 5 +-
public/css/icinga/controls.less | 65 +-
public/css/icinga/forms.less | 36 +-
public/css/icinga/layout-structure.less | 10 +-
public/css/icinga/limiter.less | 17 -
public/css/icinga/login.less | 4 +-
public/css/icinga/main-content.less | 77 -
public/css/icinga/main.less | 193 +-
public/css/icinga/menu.less | 407 +--
public/css/icinga/mixins.less | 15 +
public/css/icinga/nav.less | 29 +-
public/css/icinga/pagination.less | 44 -
public/css/icinga/selection-toolbar.less | 10 -
public/css/icinga/themes/icinga.less | 43 -
public/css/icinga/widgets.less | 98 +-
public/font/ifont.eot | Bin 31396 -> 31740 bytes
public/font/ifont.svg | 1 +
public/font/ifont.ttf | Bin 31240 -> 31584 bytes
public/font/ifont.woff | Bin 19076 -> 19324 bytes
public/img/bugreport.png | Bin 3344 -> 0 bytes
public/img/docs.png | Bin 2971 -> 0 bytes
public/img/support.png | Bin 4918 -> 0 bytes
public/img/wiki.png | Bin 3173 -> 0 bytes
public/js/icinga/behavior/actiontable.js | 12 +-
public/js/icinga/behavior/application-state.js | 31 +
public/js/icinga/behavior/navigation.js | 28 +-
public/js/icinga/behavior/sparkline.js | 45 +-
public/js/icinga/ui.js | 37 +-
test/php/bootstrap.php | 4 +-
test/php/library/Icinga/Web/HookTest.php | 1 +
226 files changed, 10654 insertions(+), 11351 deletions(-)
create mode 100644 application/controllers/ApplicationStateController.php
create mode 100644 application/forms/Control/LimiterControlForm.php
copy application/locale/{de_DE => ru_RU}/LC_MESSAGES/icinga.po (82%)
copy modules/monitoring/application/views/scripts/alertsummary/defectimage.phtml => application/views/scripts/application-state/index.phtml (100%)
copy library/Icinga/{Web => Application}/Hook.php (78%)
copy library/Icinga/{Web => Application}/Hook/GrapherHook.php (98%)
copy library/Icinga/{Web => Application}/Hook/TicketHook.php (98%)
rename library/Icinga/{Web => Application}/Hook/WebBaseHook.php (96%)
delete mode 100644 library/Icinga/Protocol/Ldap/Expression.php
copy library/Icinga/{Application => Test}/ClassLoader.php (91%)
delete mode 100644 library/Icinga/Web/Navigation/Renderer/LogoutNavigationItemRenderer.php
delete mode 100644 library/Icinga/Web/Navigation/Renderer/UserNavigationItemRenderer.php
create mode 100644 modules/doc/public/js/module.js
rename modules/iframe/{moduel.info => module.info} (83%)
copy modules/monitoring/application/locale/{de_DE => ru_RU}/LC_MESSAGES/monitoring.po (77%)
delete mode 100644 modules/monitoring/application/views/scripts/host/history.phtml
create mode 100644 modules/monitoring/application/views/scripts/object/detail-history.phtml
create mode 100644 modules/monitoring/application/views/scripts/partials/event-history.phtml
delete mode 100644 modules/monitoring/application/views/scripts/service/history.phtml
create mode 100644 modules/monitoring/library/Monitoring/Hook/DataviewExtensionHook.php
copy modules/monitoring/library/Monitoring/{Web => }/Hook/HostActionsHook.php (97%)
create mode 100644 modules/monitoring/library/Monitoring/Hook/IdoQueryExtensionHook.php
copy modules/monitoring/library/Monitoring/{Web => }/Hook/ServiceActionsHook.php (97%)
copy modules/monitoring/library/Monitoring/{Web => }/Hook/TimelineProviderHook.php (96%)
delete mode 100644 modules/monitoring/public/css/plugin-output.less
create mode 100644 public/css/icinga/about.less
delete mode 100644 public/css/icinga/limiter.less
delete mode 100644 public/css/icinga/pagination.less
delete mode 100644 public/css/icinga/selection-toolbar.less
delete mode 100644 public/css/icinga/themes/icinga.less
delete mode 100644 public/img/bugreport.png
delete mode 100644 public/img/docs.png
delete mode 100644 public/img/support.png
delete mode 100644 public/img/wiki.png
create mode 100644 public/js/icinga/behavior/application-state.js
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icingaweb2.git
More information about the Pkg-nagios-changes
mailing list