[Pkg-nagios-changes] [pkg-icingaweb2] 01/03: Merge branch 'master' into ubuntu
Alexander Wirt
formorer at debian.org
Tue Apr 26 06:35:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
formorer pushed a commit to branch ubuntu
in repository pkg-icingaweb2.
commit f965b36a49d58db20374c4f9327e8a2c44b997e5
Merge: 4fed4eb 39e1530
Author: Alexander Wirt <formorer at debian.org>
Date: Tue Apr 26 08:30:56 2016 +0200
Merge branch 'master' into ubuntu
.mailmap | 2 +
AUTHORS | 5 +-
ChangeLog | 56 ++-
README.md | 2 +-
VERSION | 2 +-
application/VERSION | 2 +-
application/controllers/DashboardController.php | 37 +-
application/controllers/ListController.php | 2 +
application/views/scripts/dashboard/settings.phtml | 3 +-
application/views/scripts/group/list.phtml | 20 +-
application/views/scripts/user/list.phtml | 14 +-
changelog.py | 90 ++--
debian/changelog | 10 +-
debian/control | 14 +-
doc/{about.md => 01-About.md} | 0
doc/{installation.md => 02-Installation.md} | 112 ++---
doc/03-Configuration.md | 15 +
doc/{resources.md => 04-Resources.md} | 0
doc/{authentication.md => 05-Authentication.md} | 71 ++-
doc/{security.md => 06-Security.md} | 29 +-
doc/{preferences.md => 07-Preferences.md} | 6 +-
doc/{vagrant.md => 99-Vagrant.md} | 0
doc/configuration.md | 15 -
doc/external_authentication.md | 86 ----
icingaweb2.spec | 23 +-
.../Application/Hook/Ticket/TicketPattern.php | 152 ++++++
library/Icinga/Application/Hook/TicketHook.php | 144 ++++--
library/Icinga/Application/Version.php | 2 +-
library/Icinga/Application/Web.php | 7 +-
library/Icinga/Authentication/AdmissionLoader.php | 31 +-
library/Icinga/Authentication/Auth.php | 9 +-
library/Icinga/Authentication/Role.php | 109 +++++
.../Icinga/Authentication/User/ExternalBackend.php | 29 +-
library/Icinga/Data/Db/DbConnection.php | 7 +-
library/Icinga/Data/Tree/TreeNodeIterator.php | 2 +-
library/Icinga/Protocol/Ldap/LdapConnection.php | 54 ++-
library/Icinga/Protocol/Ldap/LdapQuery.php | 68 +++
library/Icinga/Protocol/Ldap/LdapUtils.php | 8 +-
library/Icinga/User.php | 38 +-
library/Icinga/Util/DirectoryIterator.php | 102 ++--
library/Icinga/Util/GlobFilter.php | 182 +++++++
library/Icinga/Web/Form/Decorator/Autosubmit.php | 2 +-
library/Icinga/Web/LessCompiler.php | 13 +-
library/Icinga/Web/Menu.php | 5 +-
library/Icinga/Web/Widget/Dashboard.php | 9 +-
library/Icinga/Web/Widget/Dashboard/Pane.php | 2 +-
library/Icinga/Web/Widget/Tabs.php | 4 +-
library/vendor/Parsedown/Parsedown.php | 71 ++-
library/vendor/Parsedown/SOURCE | 2 +-
.../application/controllers/ModuleController.php | 62 ++-
modules/doc/doc/1-module-documentation.md | 12 +-
modules/doc/library/Doc/DocController.php | 24 +-
modules/doc/library/Doc/DocParser.php | 44 +-
modules/doc/library/Doc/DocSection.php | 8 -
modules/doc/library/Doc/Renderer/DocRenderer.php | 55 ++-
.../library/Doc/Renderer/DocSectionRenderer.php | 66 ++-
modules/doc/module.info | 2 +-
modules/doc/public/css/module.less | 10 +-
modules/doc/run.php | 15 +
.../application/clicommands/ListCommand.php | 3 +
.../application/controllers/HostsController.php | 3 +-
.../application/controllers/ListController.php | 248 +++++-----
.../application/controllers/ServicesController.php | 1 +
.../Instance/ToggleInstanceFeaturesCommandForm.php | 35 +-
.../application/views/helpers/IconImage.php | 4 +-
.../application/views/helpers/PluginOutput.php | 8 +
.../application/views/scripts/list/comments.phtml | 8 +-
.../views/scripts/list/contactgroups.phtml | 69 ++-
.../application/views/scripts/list/contacts.phtml | 106 +++--
.../application/views/scripts/list/downtimes.phtml | 75 +--
.../application/views/scripts/list/eventgrid.phtml | 8 +-
.../views/scripts/list/eventhistory.phtml | 6 +-
.../views/scripts/list/hostgroups.phtml | 524 +++++++++++----------
.../application/views/scripts/list/hosts.phtml | 20 +-
.../views/scripts/list/notifications.phtml | 10 +-
.../views/scripts/list/servicegroups.phtml | 318 ++++++-------
.../application/views/scripts/list/services.phtml | 34 +-
modules/monitoring/configuration.php | 4 +
.../monitoring/doc/restrict-custom-variables.md | 77 +++
.../Backend/Ido/Query/ContactgroupQuery.php | 36 +-
.../library/Monitoring/DataView/Contactgroup.php | 27 +-
.../library/Monitoring/DataView/Hoststatus.php | 76 ++-
.../library/Monitoring/DataView/Servicestatus.php | 132 +++---
.../library/Monitoring/Object/MonitoredObject.php | 32 +-
.../library/Monitoring/Web/Widget/StateBadges.php | 1 +
modules/monitoring/module.info | 2 +-
modules/monitoring/public/css/module.less | 43 +-
modules/monitoring/public/css/tables.less | 21 +-
modules/setup/module.info | 2 +-
modules/test/module.info | 2 +-
.../Translation/Util/GettextTranslationHelper.php | 1 +
modules/translation/module.info | 2 +-
public/css/icinga/base.less | 14 +-
public/css/icinga/controls.less | 76 ++-
public/css/icinga/forms.less | 4 +
public/css/icinga/layout.less | 17 +-
public/css/icinga/login.less | 2 -
public/css/icinga/main.less | 46 +-
public/css/icinga/mixins.less | 4 +-
public/css/icinga/tabs.less | 4 -
public/css/themes/high-contrast.less | 5 +
public/js/icinga/behavior/form.js | 14 +
public/js/icinga/events.js | 2 +-
public/js/icinga/ui.js | 24 +-
test/php/library/Icinga/Util/GlobFilterTest.php | 325 +++++++++++++
105 files changed, 2970 insertions(+), 1471 deletions(-)
diff --cc debian/changelog
index d35385c,a77c3ab..5af55ee
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
- icingaweb2 (2.2.0-1~ppa1) precise; urgency=medium
++icingaweb2 (2.3.1-1~ppa1) precise; urgency=medium
+
+ * Updated for my ppa
+
+ -- Alexander Wirt <formorer at debian.org> Mon, 22 Feb 2016 13:21:45 +0100
+
+ icingaweb2 (2.3.1-1) unstable; urgency=medium
+
+ * [3c80e44] Imported Upstream version 2.3.1
+ * [462f48e] Update dependencies for PHP 7.0 (Closes: #821579, #821680)
+ * [38bfc08] Depend on php-xml for DOM handling modules
+
+ -- Markus Frosch <lazyfrosch at debian.org> Tue, 19 Apr 2016 22:27:28 +0200
+
icingaweb2 (2.2.0-1) unstable; urgency=medium
* [1d4af5c] Imported Upstream version 2.2.0
diff --cc debian/control
index 617af07,ff8ba5a..83c4fa0
--- a/debian/control
+++ b/debian/control
@@@ -85,11 -86,12 +85,11 @@@ Package: php-icing
Section: php
Architecture: all
Depends:
- php,
- zendframework,
+ php5 (>= 5.3.2),
${misc:Depends}
Recommends:
- php5-mysql | php5-mysqlnd | php5-pgsql,
- php5-json
+ php-mysql | php-pgsql,
+ php-json,
Description: PHP library to communicate with and use Icinga
Icinga is a PHP library providing a PHP API to interact with Icinga's data.
.
--
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