[Pkg-nagios-changes] [pkg-icingaweb2] 01/02: Merge branch 'master' into debmon-jessie

[Markus Frosch]

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

lazyfrosch pushed a commit to branch debmon-jessie
in repository pkg-icingaweb2.

commit 26681d4fdbda75ba03ed493c968cac9829c5acb4
Merge: 6cb4145 4ab93ef
Author: Markus Frosch <lazyfrosch at debian.org>
Date:   Fri Jun 10 11:16:40 2016 +0200

    Merge branch 'master' into debmon-jessie

 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 +
 debian/changelog                                   |   6 +
 debian/control                                     |   2 +-
 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        | 206 ++++++++++++++++++++-
 .../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 ++++
 50 files changed, 775 insertions(+), 213 deletions(-)

diff --cc debian/changelog
index 6cf8de0,5fc30d7..9810da5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ icingaweb2 (2.3.3-1) unstable; urgency=medium
+ 
+   * [6c8a309] Imported Upstream version 2.3.3
+ 
+  -- Markus Frosch <lazyfrosch at debian.org>  Fri, 10 Jun 2016 11:06:50 +0200
+ 
 +icingaweb2 (2.3.2-1~debmon8+1) debmon-jessie; urgency=medium
 +
 +  * Rebuild for debmon-jessie.
 +
 + -- Markus Frosch <lazyfrosch at debian.org>  Thu, 28 Apr 2016 18:25:14 +0200
 +
  icingaweb2 (2.3.2-1) unstable; urgency=medium
  
    * [c1aee5d] Imported Upstream version 2.3.2
diff --cc debian/control
index 65e96ef,0052a3f..358afa4
--- a/debian/control
+++ b/debian/control
@@@ -6,10 -6,10 +6,10 @@@ Uploaders
   Markus Frosch <lazyfrosch at debian.org>
  Build-Depends:
   debhelper (>= 9),
 - php-cli,
 + php5-cli,
   php-htmlpurifier (>= 4.3),
   yui-compressor
- Standards-Version: 3.9.7
+ Standards-Version: 3.9.8
  Homepage: https://www.icinga.org
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-nagios/pkg-icingaweb2.git
  Vcs-Git: https://anonscm.debian.org/git/pkg-nagios/pkg-icingaweb2.git

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