[Pkg-nagios-changes] [pkg-icingaweb2] 01/01: Merge branch 'upstream' of alioth.debian.org:/git/pkg-nagios/pkg-icingaweb2 into upstream

[Alexander Wirt]

This is an automated email from the git hooks/post-receive script.

formorer pushed a commit to branch upstream
in repository pkg-icingaweb2.

commit 47a4026dfe4b8a19257c1f1ee7bf4628bbc48577
Merge: 82386a4 e111f8c
Author: Alexander Wirt <formorer at debian.org>
Date:   Sun Jul 17 10:46:03 2016 +0200

    Merge branch 'upstream' of alioth.debian.org:/git/pkg-nagios/pkg-icingaweb2 into upstream

 ChangeLog                                          |  22 ++-
 VERSION                                            |   2 +-
 application/VERSION                                |   2 +-
 application/forms/RepositoryForm.php               |  60 ++++---
 application/layouts/scripts/layout.phtml           |   6 +-
 application/locale/de_DE/LC_MESSAGES/icinga.mo     | Bin 59318 -> 60895 bytes
 application/locale/de_DE/LC_MESSAGES/icinga.po     | 175 ++++++++++---------
 application/locale/it_IT/LC_MESSAGES/icinga.po     |   2 +-
 application/locale/ru_RU/LC_MESSAGES/icinga.po     |   2 +-
 .../views/scripts/authentication/login.phtml       |   7 +
 icingaweb2.spec                                    |   2 +-
 library/Icinga/Application/Modules/Module.php      |   2 +
 library/Icinga/Application/Version.php             |   2 +-
 library/Icinga/Data/Db/DbQuery.php                 |  11 +-
 library/Icinga/Web/Form.php                        |   2 +-
 library/Icinga/Web/Form/Decorator/Autosubmit.php   |   2 +-
 library/Icinga/Web/Widget/Tabs.php                 |   2 +-
 modules/doc/module.info                            |   2 +-
 .../application/controllers/TimelineController.php |  25 ++-
 .../locale/de_DE/LC_MESSAGES/monitoring.po         |   2 +-
 .../locale/it_IT/LC_MESSAGES/monitoring.po         |   2 +-
 .../locale/pt_BR/LC_MESSAGES/monitoring.po         |   2 +-
 .../locale/ru_RU/LC_MESSAGES/monitoring.po         |   2 +-
 .../application/views/helpers/PluginOutput.php     | 120 ++++++++++++-
 .../scripts/partials/comment/comment-detail.phtml  |  10 +-
 .../partials/downtime/downtime-header.phtml        |   9 +-
 .../scripts/partials/object/host-header.phtml      |   5 +
 .../application/views/scripts/timeline/index.phtml |  17 +-
 .../Backend/Ido/Query/HoststatusQuery.php          |   5 -
 .../Backend/Ido/Query/ServicestatusQuery.php       |  10 --
 .../Command/Transport/RemoteCommandFile.php        | 186 +++++++++++++++++++--
 .../library/Monitoring/Timeline/TimeEntry.php      |  23 +--
 .../library/Monitoring/Timeline/TimeLine.php       |   4 +-
 .../Web/Controller/MonitoredObjectController.php   |   1 +
 .../library/Monitoring/Web/Widget/StateBadges.php  |   5 +-
 modules/monitoring/module.info                     |   2 +-
 modules/monitoring/public/css/module.less          |  61 ++++++-
 .../test/php/regression/Bug11728Test.php           |  25 +++
 .../test/php/regression/Bug11796Test.php           |  27 +++
 modules/setup/module.info                          |   2 +-
 modules/test/module.info                           |   2 +-
 modules/translation/module.info                    |   2 +-
 public/css/icinga/login.less                       |   1 +
 public/css/icinga/menu.less                        |   1 +
 public/css/themes/high-contrast.less               |  61 ++++++-
 public/img/touch-icon.png                          | Bin 0 -> 4777 bytes
 public/js/icinga/events.js                         |   8 +-
 test/php/regression/Bug11831Test.php               |  37 ++++
 48 files changed, 748 insertions(+), 212 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icingaweb2.git