[Pkg-nagios-changes] [pkg-icingaweb2] 01/01: Merge branch 'master' into ubuntu
Markus Frosch
lazyfrosch at moszumanska.debian.org
Fri Jun 10 10:06:32 UTC 2016
This is an automated email from the git hooks/post-receive script.
lazyfrosch pushed a commit to branch ubuntu
in repository pkg-icingaweb2.
commit bd205f513bb8eace2297e8874fc84e46b1987288
Merge: 15b2b45 4ab93ef
Author: Markus Frosch <lazyfrosch at debian.org>
Date: Fri Jun 10 12:06:03 2016 +0200
Merge branch 'master' into ubuntu
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 b531672,5fc30d7..10a14d3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,9 +1,21 @@@
+ 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~ppa3) xenial; urgency=medium
+
+ * Fix php version on xenial
+
+ -- Alexander Wirt <formorer at debian.org> Tue, 17 May 2016 15:05:21 +0200
+
+icingaweb2 (2.3.2-1~ppa1) trusty; urgency=medium
+
+ * Updated for my ppa
+
+ -- Alexander Wirt <formorer at debian.org> Mon, 22 Feb 2016 13:21:45 +0100
+
icingaweb2 (2.3.2-1) unstable; urgency=medium
* [c1aee5d] Imported Upstream version 2.3.2
--
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