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

Markus Frosch lazyfrosch at moszumanska.debian.org
Wed Dec 23 14:31:47 UTC 2015


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 dac5e73b97fcf159c6f58bc2a85946ab3c380b7d
Merge: 52a42ea 57a6dbe
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Wed Dec 23 15:24:50 2015 +0100

    Merge branch 'master' into debmon-jessie

 .mailmap                                           |    3 +
 AUTHORS                                            |    9 +-
 ChangeLog                                          |   32 +
 VERSION                                            |    2 +-
 application/VERSION                                |    2 +-
 application/clicommands/WebCommand.php             |   16 +-
 .../controllers/ApplicationStateController.php     |    2 +-
 .../controllers/AuthenticationController.php       |    6 +-
 application/controllers/DashboardController.php    |   12 +-
 application/controllers/ErrorController.php        |    3 +-
 application/controllers/StaticController.php       |   94 +-
 .../forms/Config/General/ApplicationConfigForm.php |   11 +-
 .../forms/Config/General/LoggingConfigForm.php     |   14 +-
 .../forms/Config/General/ThemingConfigForm.php     |   78 +
 application/forms/Config/GeneralConfigForm.php     |   13 +-
 application/forms/Config/UserBackendConfigForm.php |   15 -
 .../Config/UserGroup/UserGroupBackendForm.php      |   15 -
 application/forms/ConfigForm.php                   |   19 +-
 application/forms/Control/LimiterControlForm.php   |    4 +-
 .../forms/Navigation/NavigationConfigForm.php      |   11 -
 application/forms/PreferenceForm.php               |   37 +-
 application/forms/Security/RoleForm.php            |   28 +-
 application/layouts/scripts/body.phtml             |   12 +-
 application/layouts/scripts/error.phtml            |    8 -
 application/layouts/scripts/guest-error.phtml      |   10 +
 application/layouts/scripts/inline.phtml           |    2 -
 application/layouts/scripts/layout.phtml           |    5 +-
 application/layouts/scripts/pdf.phtml              |    2 +-
 application/locale/de_DE/LC_MESSAGES/icinga.mo     |  Bin 59490 -> 59479 bytes
 application/locale/de_DE/LC_MESSAGES/icinga.po     |    4 +-
 .../views/scripts/authentication/login.phtml       |  104 +-
 application/views/scripts/error/error.phtml        |    8 +-
 application/views/scripts/group/list.phtml         |    2 +-
 application/views/scripts/group/show.phtml         |    2 +-
 application/views/scripts/user/list.phtml          |    2 +-
 application/views/scripts/user/show.phtml          |    2 +-
 debian/changelog                                   |    9 +
 debian/copyright                                   |    4 +-
 debian/patches/10_html_purifier                    |   28 +-
 doc/installation.md                                |    4 +-
 icingaweb2.spec                                    |   13 +-
 .../Icinga/Application/ApplicationBootstrap.php    |    5 +-
 library/Icinga/Application/EmbeddedWeb.php         |    5 +-
 library/Icinga/Application/Hook.php                |    7 +
 library/Icinga/Application/Modules/Module.php      |   23 +-
 library/Icinga/Application/Version.php             |    2 +-
 library/Icinga/Application/Web.php                 |   37 +-
 library/Icinga/Application/webrouter.php           |    2 +-
 .../Icinga/Authentication/User/ExternalBackend.php |    4 +-
 .../UserGroup/LdapUserGroupBackend.php             |    1 +
 library/Icinga/Cli/Screen.php                      |    2 +-
 library/Icinga/Data/Db/DbConnection.php            |   27 +-
 library/Icinga/Data/Db/DbQuery.php                 |   26 +-
 library/Icinga/Data/PivotTable.php                 |   14 +-
 library/Icinga/Data/Tree/TreeNodeIterator.php      |   10 +
 .../Icinga/File/FileExtensionFilterIterator.php    |   70 -
 library/Icinga/File/NonEmptyFileIterator.php       |   48 -
 library/Icinga/Protocol/Ldap/LdapConnection.php    |    2 +-
 library/Icinga/Repository/DbRepository.php         |   83 +-
 library/Icinga/Repository/RepositoryQuery.php      |   19 +
 library/Icinga/Util/DirectoryIterator.php          |  191 +
 library/Icinga/Util/String.php                     |   14 +-
 library/Icinga/Web/Controller.php                  |   11 +-
 library/Icinga/Web/Cookie.php                      |  251 +-
 library/Icinga/Web/CookieSet.php                   |   57 +
 library/Icinga/Web/FileCache.php                   |   31 +-
 .../Web/{Cookie.php => Helper/CookieHelper.php}    |    6 +-
 library/Icinga/Web/JavaScript.php                  |   20 +-
 library/Icinga/Web/LessCompiler.php                |  203 +-
 library/Icinga/Web/Request.php                     |   11 -
 library/Icinga/Web/Response.php                    |  103 +
 library/Icinga/Web/StyleSheet.php                  |  237 +-
 library/Icinga/Web/View/helpers/string.php         |    4 +
 library/Icinga/Web/Widget/Dashboard.php            |    4 +-
 library/Icinga/Web/Widget/FilterEditor.php         |    2 +-
 library/Icinga/Web/Widget/SortBox.php              |   80 +-
 library/Icinga/Web/Widget/Tabs.php                 |   20 +-
 .../{HTMLPurifier => }/HTMLPurifier.autoload.php   |    0
 library/vendor/{HTMLPurifier => }/HTMLPurifier.php |    0
 .../HTMLPurifier/DefinitionCache/Serializer/README |    0
 library/vendor/HTMLPurifier/HTMLPurifier.auto.php  |   11 -
 .../vendor/HTMLPurifier/HTMLPurifier.composer.php  |    4 -
 library/vendor/HTMLPurifier/HTMLPurifier.func.php  |   25 -
 .../vendor/HTMLPurifier/HTMLPurifier.includes.php  |  229 -
 library/vendor/HTMLPurifier/HTMLPurifier.kses.php  |   30 -
 library/vendor/HTMLPurifier/HTMLPurifier.path.php  |   11 -
 .../HTMLPurifier/HTMLPurifier.safe-includes.php    |  223 -
 .../vendor/HTMLPurifier/HTMLPurifier/Arborize.php  |   71 -
 .../HTMLPurifier/HTMLPurifier/AttrCollections.php  |  143 -
 .../vendor/HTMLPurifier/HTMLPurifier/AttrDef.php   |  138 -
 .../HTMLPurifier/HTMLPurifier/AttrDef/CSS.php      |  106 -
 .../HTMLPurifier/AttrDef/CSS/AlphaValue.php        |   34 -
 .../HTMLPurifier/AttrDef/CSS/Background.php        |  111 -
 .../AttrDef/CSS/BackgroundPosition.php             |  157 -
 .../HTMLPurifier/AttrDef/CSS/Border.php            |   56 -
 .../HTMLPurifier/AttrDef/CSS/Color.php             |  105 -
 .../HTMLPurifier/AttrDef/CSS/Composite.php         |   48 -
 .../AttrDef/CSS/DenyElementDecorator.php           |   44 -
 .../HTMLPurifier/AttrDef/CSS/Filter.php            |   77 -
 .../HTMLPurifier/HTMLPurifier/AttrDef/CSS/Font.php |  176 -
 .../HTMLPurifier/AttrDef/CSS/FontFamily.php        |  219 -
 .../HTMLPurifier/AttrDef/CSS/Ident.php             |   32 -
 .../AttrDef/CSS/ImportantDecorator.php             |   56 -
 .../HTMLPurifier/AttrDef/CSS/Length.php            |   77 -
 .../HTMLPurifier/AttrDef/CSS/ListStyle.php         |  112 -
 .../HTMLPurifier/AttrDef/CSS/Multiple.php          |   71 -
 .../HTMLPurifier/AttrDef/CSS/Number.php            |   84 -
 .../HTMLPurifier/AttrDef/CSS/Percentage.php        |   54 -
 .../HTMLPurifier/AttrDef/CSS/TextDecoration.php    |   46 -
 .../HTMLPurifier/HTMLPurifier/AttrDef/CSS/URI.php  |   74 -
 .../HTMLPurifier/HTMLPurifier/AttrDef/Clone.php    |   44 -
 .../HTMLPurifier/HTMLPurifier/AttrDef/Enum.php     |   73 -
 .../HTMLPurifier/AttrDef/HTML/Bool.php             |   48 -
 .../HTMLPurifier/AttrDef/HTML/Class.php            |   48 -
 .../HTMLPurifier/AttrDef/HTML/Color.php            |   51 -
 .../HTMLPurifier/AttrDef/HTML/FrameTarget.php      |   38 -
 .../HTMLPurifier/HTMLPurifier/AttrDef/HTML/ID.php  |  105 -
 .../HTMLPurifier/AttrDef/HTML/Length.php           |   56 -
 .../HTMLPurifier/AttrDef/HTML/LinkTypes.php        |   72 -
 .../HTMLPurifier/AttrDef/HTML/MultiLength.php      |   60 -
 .../HTMLPurifier/AttrDef/HTML/Nmtokens.php         |   70 -
 .../HTMLPurifier/AttrDef/HTML/Pixels.php           |   76 -
 .../HTMLPurifier/HTMLPurifier/AttrDef/Integer.php  |   91 -
 .../HTMLPurifier/HTMLPurifier/AttrDef/Lang.php     |   86 -
 .../HTMLPurifier/HTMLPurifier/AttrDef/Switch.php   |   53 -
 .../HTMLPurifier/HTMLPurifier/AttrDef/Text.php     |   21 -
 .../HTMLPurifier/HTMLPurifier/AttrDef/URI.php      |  111 -
 .../HTMLPurifier/AttrDef/URI/Email.php             |   20 -
 .../HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php |   29 -
 .../HTMLPurifier/HTMLPurifier/AttrDef/URI/Host.php |  128 -
 .../HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv4.php |   45 -
 .../HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv6.php |   89 -
 .../HTMLPurifier/HTMLPurifier/AttrTransform.php    |   60 -
 .../HTMLPurifier/AttrTransform/Background.php      |   28 -
 .../HTMLPurifier/AttrTransform/BdoDir.php          |   27 -
 .../HTMLPurifier/AttrTransform/BgColor.php         |   28 -
 .../HTMLPurifier/AttrTransform/BoolToCSS.php       |   47 -
 .../HTMLPurifier/AttrTransform/Border.php          |   26 -
 .../HTMLPurifier/AttrTransform/EnumToCSS.php       |   68 -
 .../HTMLPurifier/AttrTransform/ImgRequired.php     |   48 -
 .../HTMLPurifier/AttrTransform/ImgSpace.php        |   61 -
 .../HTMLPurifier/AttrTransform/Input.php           |   56 -
 .../HTMLPurifier/AttrTransform/Lang.php            |   31 -
 .../HTMLPurifier/AttrTransform/Length.php          |   45 -
 .../HTMLPurifier/AttrTransform/Name.php            |   33 -
 .../HTMLPurifier/AttrTransform/NameSync.php        |   41 -
 .../HTMLPurifier/AttrTransform/Nofollow.php        |   52 -
 .../HTMLPurifier/AttrTransform/SafeEmbed.php       |   25 -
 .../HTMLPurifier/AttrTransform/SafeObject.php      |   28 -
 .../HTMLPurifier/AttrTransform/SafeParam.php       |   79 -
 .../HTMLPurifier/AttrTransform/ScriptRequired.php  |   23 -
 .../HTMLPurifier/AttrTransform/TargetBlank.php     |   45 -
 .../HTMLPurifier/AttrTransform/Textarea.php        |   27 -
 .../vendor/HTMLPurifier/HTMLPurifier/AttrTypes.php |   96 -
 .../HTMLPurifier/HTMLPurifier/AttrValidator.php    |  178 -
 .../vendor/HTMLPurifier/HTMLPurifier/Bootstrap.php |  124 -
 .../HTMLPurifier/HTMLPurifier/CSSDefinition.php    |  474 --
 .../vendor/HTMLPurifier/HTMLPurifier/ChildDef.php  |   52 -
 .../HTMLPurifier/ChildDef/Chameleon.php            |   67 -
 .../HTMLPurifier/HTMLPurifier/ChildDef/Custom.php  |  102 -
 .../HTMLPurifier/HTMLPurifier/ChildDef/Empty.php   |   38 -
 .../HTMLPurifier/HTMLPurifier/ChildDef/List.php    |   86 -
 .../HTMLPurifier/ChildDef/Optional.php             |   45 -
 .../HTMLPurifier/ChildDef/Required.php             |  118 -
 .../HTMLPurifier/ChildDef/StrictBlockquote.php     |  110 -
 .../HTMLPurifier/HTMLPurifier/ChildDef/Table.php   |  224 -
 .../vendor/HTMLPurifier/HTMLPurifier/Config.php    |  920 ----
 .../HTMLPurifier/HTMLPurifier/ConfigSchema.php     |  176 -
 .../ConfigSchema/Builder/ConfigSchema.php          |   48 -
 .../HTMLPurifier/ConfigSchema/Builder/Xml.php      |  144 -
 .../HTMLPurifier/ConfigSchema/Exception.php        |   11 -
 .../HTMLPurifier/ConfigSchema/Interchange.php      |   47 -
 .../ConfigSchema/Interchange/Directive.php         |   89 -
 .../HTMLPurifier/ConfigSchema/Interchange/Id.php   |   58 -
 .../ConfigSchema/InterchangeBuilder.php            |  226 -
 .../HTMLPurifier/ConfigSchema/Validator.php        |  248 -
 .../HTMLPurifier/ConfigSchema/ValidatorAtom.php    |  130 -
 .../HTMLPurifier/HTMLPurifier/ContentSets.php      |  170 -
 .../vendor/HTMLPurifier/HTMLPurifier/Context.php   |   95 -
 .../HTMLPurifier/HTMLPurifier/Definition.php       |   55 -
 .../HTMLPurifier/HTMLPurifier/DefinitionCache.php  |  129 -
 .../HTMLPurifier/DefinitionCache/Decorator.php     |  112 -
 .../DefinitionCache/Decorator/Cleanup.php          |   78 -
 .../DefinitionCache/Decorator/Memory.php           |   85 -
 .../HTMLPurifier/DefinitionCache/Null.php          |   76 -
 .../HTMLPurifier/DefinitionCache/Serializer.php    |  291 --
 .../HTMLPurifier/DefinitionCacheFactory.php        |  106 -
 .../vendor/HTMLPurifier/HTMLPurifier/Doctype.php   |   73 -
 .../HTMLPurifier/HTMLPurifier/DoctypeRegistry.php  |  142 -
 .../HTMLPurifier/HTMLPurifier/ElementDef.php       |  216 -
 .../vendor/HTMLPurifier/HTMLPurifier/Encoder.php   |  611 ---
 .../HTMLPurifier/HTMLPurifier/EntityLookup.php     |   48 -
 .../HTMLPurifier/HTMLPurifier/EntityParser.php     |  153 -
 .../HTMLPurifier/HTMLPurifier/ErrorCollector.php   |  244 -
 .../HTMLPurifier/HTMLPurifier/ErrorStruct.php      |   74 -
 .../vendor/HTMLPurifier/HTMLPurifier/Exception.php |   12 -
 .../vendor/HTMLPurifier/HTMLPurifier/Filter.php    |   56 -
 .../HTMLPurifier/Filter/ExtractStyleBlocks.php     |  338 --
 .../HTMLPurifier/HTMLPurifier/Filter/YouTube.php   |   65 -
 .../vendor/HTMLPurifier/HTMLPurifier/Generator.php |  286 --
 .../HTMLPurifier/HTMLPurifier/HTMLDefinition.php   |  493 --
 .../HTMLPurifier/HTMLPurifier/HTMLModule.php       |  284 --
 .../HTMLPurifier/HTMLPurifier/HTMLModule/Bdo.php   |   44 -
 .../HTMLPurifier/HTMLModule/CommonAttributes.php   |   31 -
 .../HTMLPurifier/HTMLPurifier/HTMLModule/Edit.php  |   55 -
 .../HTMLPurifier/HTMLPurifier/HTMLModule/Forms.php |  190 -
 .../HTMLPurifier/HTMLModule/Hypertext.php          |   40 -
 .../HTMLPurifier/HTMLModule/Iframe.php             |   51 -
 .../HTMLPurifier/HTMLPurifier/HTMLModule/Image.php |   49 -
 .../HTMLPurifier/HTMLModule/Legacy.php             |  186 -
 .../HTMLPurifier/HTMLPurifier/HTMLModule/List.php  |   51 -
 .../HTMLPurifier/HTMLPurifier/HTMLModule/Name.php  |   26 -
 .../HTMLPurifier/HTMLModule/Nofollow.php           |   25 -
 .../HTMLModule/NonXMLCommonAttributes.php          |   20 -
 .../HTMLPurifier/HTMLModule/Object.php             |   62 -
 .../HTMLPurifier/HTMLModule/Presentation.php       |   42 -
 .../HTMLPurifier/HTMLModule/Proprietary.php        |   40 -
 .../HTMLPurifier/HTMLPurifier/HTMLModule/Ruby.php  |   36 -
 .../HTMLPurifier/HTMLModule/SafeEmbed.php          |   40 -
 .../HTMLPurifier/HTMLModule/SafeObject.php         |   62 -
 .../HTMLPurifier/HTMLModule/SafeScripting.php      |   40 -
 .../HTMLPurifier/HTMLModule/Scripting.php          |   73 -
 .../HTMLPurifier/HTMLModule/StyleAttribute.php     |   33 -
 .../HTMLPurifier/HTMLModule/Tables.php             |   75 -
 .../HTMLPurifier/HTMLModule/Target.php             |   28 -
 .../HTMLPurifier/HTMLModule/TargetBlank.php        |   24 -
 .../HTMLPurifier/HTMLPurifier/HTMLModule/Text.php  |   87 -
 .../HTMLPurifier/HTMLPurifier/HTMLModule/Tidy.php  |  230 -
 .../HTMLPurifier/HTMLModule/Tidy/Name.php          |   33 -
 .../HTMLPurifier/HTMLModule/Tidy/Proprietary.php   |   34 -
 .../HTMLPurifier/HTMLModule/Tidy/Strict.php        |   43 -
 .../HTMLPurifier/HTMLModule/Tidy/Transitional.php  |   16 -
 .../HTMLPurifier/HTMLModule/Tidy/XHTML.php         |   26 -
 .../HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php |  179 -
 .../HTMLModule/XMLCommonAttributes.php             |   20 -
 .../HTMLPurifier/HTMLModuleManager.php             |  459 --
 .../HTMLPurifier/HTMLPurifier/IDAccumulator.php    |   57 -
 .../vendor/HTMLPurifier/HTMLPurifier/Injector.php  |  281 --
 .../HTMLPurifier/Injector/AutoParagraph.php        |  356 --
 .../HTMLPurifier/Injector/DisplayLinkURI.php       |   40 -
 .../HTMLPurifier/HTMLPurifier/Injector/Linkify.php |   59 -
 .../HTMLPurifier/Injector/PurifierLinkify.php      |   71 -
 .../HTMLPurifier/Injector/RemoveEmpty.php          |  106 -
 .../Injector/RemoveSpansWithoutAttributes.php      |   84 -
 .../HTMLPurifier/Injector/SafeObject.php           |  121 -
 .../vendor/HTMLPurifier/HTMLPurifier/Language.php  |  204 -
 .../HTMLPurifier/Language/classes/en-x-test.php    |    9 -
 .../HTMLPurifier/Language/messages/en-x-test.php   |   11 -
 .../Language/messages/en-x-testmini.php            |   12 -
 .../HTMLPurifier/Language/messages/en.php          |   55 -
 .../HTMLPurifier/HTMLPurifier/LanguageFactory.php  |  209 -
 .../vendor/HTMLPurifier/HTMLPurifier/Length.php    |  160 -
 library/vendor/HTMLPurifier/HTMLPurifier/Lexer.php |  357 --
 .../HTMLPurifier/HTMLPurifier/Lexer/DOMLex.php     |  279 --
 .../HTMLPurifier/HTMLPurifier/Lexer/DirectLex.php  |  539 ---
 .../HTMLPurifier/HTMLPurifier/Lexer/PH5P.php       | 4787 --------------------
 library/vendor/HTMLPurifier/HTMLPurifier/Node.php  |   49 -
 .../HTMLPurifier/HTMLPurifier/Node/Comment.php     |   36 -
 .../HTMLPurifier/HTMLPurifier/Node/Element.php     |   59 -
 .../vendor/HTMLPurifier/HTMLPurifier/Node/Text.php |   54 -
 .../HTMLPurifier/HTMLPurifier/PercentEncoder.php   |  111 -
 .../vendor/HTMLPurifier/HTMLPurifier/Printer.php   |  218 -
 .../HTMLPurifier/Printer/CSSDefinition.php         |   44 -
 .../HTMLPurifier/Printer/ConfigForm.php            |  447 --
 .../HTMLPurifier/Printer/HTMLDefinition.php        |  324 --
 .../HTMLPurifier/HTMLPurifier/PropertyList.php     |  122 -
 .../HTMLPurifier/PropertyListIterator.php          |   42 -
 library/vendor/HTMLPurifier/HTMLPurifier/Queue.php |   56 -
 .../vendor/HTMLPurifier/HTMLPurifier/Strategy.php  |   26 -
 .../HTMLPurifier/Strategy/Composite.php            |   30 -
 .../HTMLPurifier/HTMLPurifier/Strategy/Core.php    |   17 -
 .../HTMLPurifier/Strategy/FixNesting.php           |  181 -
 .../HTMLPurifier/Strategy/MakeWellFormed.php       |  600 ---
 .../Strategy/RemoveForeignElements.php             |  207 -
 .../HTMLPurifier/Strategy/ValidateAttributes.php   |   45 -
 .../HTMLPurifier/HTMLPurifier/StringHash.php       |   47 -
 .../HTMLPurifier/HTMLPurifier/StringHashParser.php |  136 -
 .../HTMLPurifier/HTMLPurifier/TagTransform.php     |   37 -
 .../HTMLPurifier/TagTransform/Font.php             |  114 -
 .../HTMLPurifier/TagTransform/Simple.php           |   44 -
 library/vendor/HTMLPurifier/HTMLPurifier/Token.php |  100 -
 .../HTMLPurifier/HTMLPurifier/Token/Comment.php    |   38 -
 .../HTMLPurifier/HTMLPurifier/Token/Empty.php      |   15 -
 .../vendor/HTMLPurifier/HTMLPurifier/Token/End.php |   24 -
 .../HTMLPurifier/HTMLPurifier/Token/Start.php      |   10 -
 .../vendor/HTMLPurifier/HTMLPurifier/Token/Tag.php |   68 -
 .../HTMLPurifier/HTMLPurifier/Token/Text.php       |   53 -
 .../HTMLPurifier/HTMLPurifier/TokenFactory.php     |  118 -
 library/vendor/HTMLPurifier/HTMLPurifier/URI.php   |  314 --
 .../HTMLPurifier/HTMLPurifier/URIDefinition.php    |  112 -
 .../vendor/HTMLPurifier/HTMLPurifier/URIFilter.php |   74 -
 .../HTMLPurifier/URIFilter/DisableExternal.php     |   54 -
 .../URIFilter/DisableExternalResources.php         |   25 -
 .../HTMLPurifier/URIFilter/DisableResources.php    |   22 -
 .../HTMLPurifier/URIFilter/HostBlacklist.php       |   46 -
 .../HTMLPurifier/URIFilter/MakeAbsolute.php        |  158 -
 .../HTMLPurifier/HTMLPurifier/URIFilter/Munge.php  |  115 -
 .../HTMLPurifier/URIFilter/SafeIframe.php          |   68 -
 .../vendor/HTMLPurifier/HTMLPurifier/URIParser.php |   71 -
 .../vendor/HTMLPurifier/HTMLPurifier/URIScheme.php |  102 -
 .../HTMLPurifier/HTMLPurifier/URIScheme/data.php   |  127 -
 .../HTMLPurifier/HTMLPurifier/URIScheme/file.php   |   44 -
 .../HTMLPurifier/HTMLPurifier/URIScheme/ftp.php    |   58 -
 .../HTMLPurifier/HTMLPurifier/URIScheme/http.php   |   36 -
 .../HTMLPurifier/HTMLPurifier/URIScheme/https.php  |   18 -
 .../HTMLPurifier/HTMLPurifier/URIScheme/mailto.php |   40 -
 .../HTMLPurifier/HTMLPurifier/URIScheme/news.php   |   35 -
 .../HTMLPurifier/HTMLPurifier/URIScheme/nntp.php   |   32 -
 .../HTMLPurifier/URISchemeRegistry.php             |   81 -
 .../HTMLPurifier/HTMLPurifier/UnitConverter.php    |  307 --
 .../vendor/HTMLPurifier/HTMLPurifier/VarParser.php |  198 -
 .../HTMLPurifier/VarParser/Flexible.php            |  130 -
 .../HTMLPurifier/HTMLPurifier/VarParser/Native.php |   38 -
 .../HTMLPurifier/VarParserException.php            |   11 -
 .../vendor/HTMLPurifier/HTMLPurifier/Zipper.php    |  157 -
 library/vendor/HTMLPurifier/SOURCE                 |    4 +-
 library/vendor/HTMLPurifier/VERSION                |    1 +
 .../application/views/scripts/style/guide.phtml    |  135 +-
 modules/doc/library/Doc/DocIterator.php            |   63 -
 modules/doc/library/Doc/DocParser.php              |   36 +-
 .../library/Doc/Exception/DocEmptyException.php    |   11 -
 .../doc/library/Doc/Renderer/DocTocRenderer.php    |    3 +
 modules/doc/module.info                            |    2 +-
 modules/iframe/module.info                         |    2 +-
 .../application/controllers/HostController.php     |    1 +
 .../application/controllers/HostsController.php    |    1 +
 .../application/controllers/ListController.php     |   30 +-
 .../application/controllers/ServicesController.php |    2 +-
 .../Object/ScheduleHostDowntimeCommandForm.php     |   37 +-
 .../forms/Config/TransportConfigForm.php           |   15 -
 .../locale/de_DE/LC_MESSAGES/monitoring.mo         |  Bin 75291 -> 75289 bytes
 .../locale/de_DE/LC_MESSAGES/monitoring.po         |    4 +-
 .../locale/it_IT/LC_MESSAGES/monitoring.mo         |  Bin 82241 -> 82245 bytes
 .../locale/it_IT/LC_MESSAGES/monitoring.po         |    4 +-
 .../locale/ru_RU/LC_MESSAGES/monitoring.po         |    4 +-
 .../application/views/helpers/PluginOutput.php     |   16 +-
 .../views/scripts/alertsummary/index.phtml         |    2 +-
 .../application/views/scripts/downtime/show.phtml  |    2 +-
 .../application/views/scripts/hosts/show.phtml     |    4 +-
 .../application/views/scripts/list/comments.phtml  |   68 +-
 .../scripts/list/components/hostssummary.phtml     |    2 +-
 .../scripts/list/components/servicesummary.phtml   |    2 +-
 .../application/views/scripts/list/downtimes.phtml |    4 +-
 .../views/scripts/list/hostgroups.phtml            |   14 +-
 .../views/scripts/list/servicegroups.phtml         |    8 +-
 .../scripts/partials/comment/comment-detail.phtml  |   62 +-
 .../partials/downtime/downtime-header.phtml        |   49 +-
 .../partials/downtime/downtimes-header.phtml       |    4 +-
 .../application/views/scripts/services/show.phtml  |    4 +-
 .../scripts/show/components/acknowledgement.phtml  |   25 +-
 .../views/scripts/show/components/comments.phtml   |   38 +-
 .../views/scripts/show/components/contacts.phtml   |    7 +-
 .../views/scripts/show/components/downtime.phtml   |   37 +-
 .../library/Monitoring/DataView/Hoststatus.php     |    2 +-
 .../library/Monitoring/DataView/Servicestatus.php  |    3 +
 .../library/Monitoring/Object/MonitoredObject.php  |    7 +-
 .../library/Monitoring/Plugin/Perfdata.php         |    2 +-
 .../library/Monitoring/Web/Navigation/Action.php   |    5 +-
 modules/monitoring/module.info                     |    2 +-
 modules/monitoring/public/css/module.less          |   26 +-
 modules/monitoring/public/css/tables.less          |   22 +-
 .../application/clicommands/ConfigCommand.php      |    2 +-
 .../setup/application/forms/AdminAccountPage.php   |    4 +-
 .../setup/application/forms/AuthenticationPage.php |    2 +-
 modules/setup/application/forms/WelcomePage.php    |    1 +
 .../application/locale/it_IT/LC_MESSAGES/setup.mo  |  Bin 0 -> 34587 bytes
 .../application/locale/it_IT/LC_MESSAGES/setup.po  | 1513 +++++++
 .../views/scripts/form/setup-welcome.phtml         |   38 +-
 modules/setup/library/Setup/Utils/MakeDirStep.php  |   70 -
 modules/setup/module.info                          |    2 +-
 modules/test/module.info                           |    2 +-
 modules/translation/module.info                    |    2 +-
 public/css/icinga/base.less                        |   33 +-
 public/css/icinga/footer-elements.less             |   50 -
 public/css/icinga/forms.less                       |   41 +-
 public/css/icinga/header-elements.less             |   18 -
 public/css/icinga/layout-colors.less               |   37 -
 public/css/icinga/layout-structure.less            |   35 -
 public/css/icinga/layout.less                      |  121 +
 public/css/icinga/login.less                       |  198 +-
 public/css/icinga/main.less                        |   82 +-
 public/css/icinga/mixins.less                      |   72 +-
 public/css/icinga/print.less                       |   31 +
 public/css/icinga/tabs.less                        |   12 -
 public/css/pdf/pdfprint.less                       |   26 +-
 public/css/themes/Winter.less                      |   38 +
 public/img/icons/search_icinga_blue.png            |  Bin 0 -> 432 bytes
 public/img/winter/logo_icinga_big_winter.png       |  Bin 0 -> 9474 bytes
 public/img/winter/snow1.png                        |  Bin 0 -> 2765 bytes
 public/img/winter/snow2.png                        |  Bin 0 -> 4867 bytes
 public/img/winter/snow3.png                        |  Bin 0 -> 3117 bytes
 public/js/icinga/behavior/application-state.js     |    9 +-
 public/js/icinga/behavior/autofocus.js             |   24 +
 public/js/icinga/behavior/dropdown.js              |   63 +
 public/js/icinga/behavior/navigation.js            |   10 +-
 public/js/icinga/behavior/selectable.js            |   47 +-
 public/js/icinga/behavior/sparkline.js             |    2 -
 public/js/icinga/events.js                         |    1 +
 public/js/icinga/ui.js                             |  147 +-
 399 files changed, 4127 insertions(+), 30868 deletions(-)

diff --cc debian/changelog
index 6d9d4aa,fab64dd..4823ed0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,18 @@@
+ icingaweb2 (2.1.2-1) unstable; urgency=medium
+ 
+   * [92126c1] Imported Upstream version 2.1.1
+   * [bac2ae7] Update html_purifier patch for downwards compatibility
+   * [a488312] Update copyright
+   * [6abcf98] Imported Upstream version 2.1.2
+ 
+  -- Markus Frosch <lazyfrosch at debian.org>  Wed, 23 Dec 2015 15:15:40 +0100
+ 
 +icingaweb2 (2.1.0-2~debmon80+1) debmon-jessie; urgency=medium
 +
 +  * Rebuild for debmon-jessie
 +
 + -- Alexander Wirt <formorer at debian.org>  Wed, 18 Nov 2015 11:54:29 +0100
 +
  icingaweb2 (2.1.0-2) unstable; urgency=medium
  
    [ Markus Frosch ]

-- 
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