Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 20 Jul 2016 10:00:32 +0000 (12:00 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 20 Jul 2016 10:00:32 +0000 (12:00 +0200)
Change-Id: Ib5676be165a1b1d0f574fe75c5d0ce64adb3dbb0

1  2 
tests/tine20/Timetracker/JsonTest.php
tine20/Calendar/Preference.php
tine20/composer.json
tine20/composer.lock

Simple merge
Simple merge
@@@ -6,10 -6,10 +6,13 @@@
      "homepage": "http://www.tine20.org",
      "license" : ["AGPL-3.0", "BSD-3-Clause", "LGPL-2.1+", "MIT"],
      "repositories": [{
+       "type": "git",
+       "url": "http://git.tine20.org/git/composerapploader"
+     }, {
          "type": "git",
 +        "url": "http://git.tine20.org/git/zendframework1"
 +    },{
 +        "type": "git",
          "url": "http://git.tine20.org/git/opendocument"
      }, {
          "type": "git",
          "url": "http://git.syncroton.org/Syncroton"
      }],
      "require": {
-         "zendframework/zendframework1": "dev-master as 1.12.18",
++        "zendframework/zendframework1": "1.12.18",
+         "tine20/composerapploader": "dev-master",
          "syncroton/syncroton": "1.1.*",
          "ezyang/htmlpurifier": "v4.6.0",
          "codeplex/phpexcel": "1.7.8",
@@@ -4,8 -4,8 +4,8 @@@
          "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
          "This file is @generated automatically"
      ],
-     "hash": "ec05b1621982d234080ae6de8022685a",
-     "content-hash": "a5f1311184c5ce946ce0a4814797a8cb",
 -    "hash": "feeb992c226b6bb0f91d7a17911dfa52",
 -    "content-hash": "bb2e4e82df2e5ee597c9133109608553",
++    "hash": "576609c4b6b10805fd6fdda63e9c711b",
++    "content-hash": "ff25619377549674cfa8e4cf6375268b",
      "packages": [
          {
              "name": "codeplex/phpexcel",
              "time": "2015-09-22 09:21:43"
          },
          {
+             "name": "tine20/composerapploader",
+             "version": "dev-master",
+             "source": {
+                 "type": "git",
+                 "url": "http://git.tine20.org/git/composerapploader",
+                 "reference": "b9e480b6c26f6556ca742e96badfeb1ebd59ecb7"
+             },
+             "require": {
+                 "composer-plugin-api": ">=1.0.0"
+             },
+             "require-dev": {
+                 "composer/composer": "1.*"
+             },
+             "type": "composer-plugin",
+             "extra": {
+                 "class": "Tine20\\ComposerAppLoader\\Plugin"
+             },
+             "autoload": {
+                 "psr-4": {
+                     "Tine20\\ComposerAppLoader\\": "src/"
+                 }
+             },
+             "time": "2016-07-14 11:55:28"
+         },
+         {
              "name": "zendframework/zend-escaper",
 -            "version": "2.2.10",
 +            "version": "2.4.10",
              "source": {
                  "type": "git",
                  "url": "https://github.com/zendframework/zend-escaper.git",
          },
          {
              "name": "zendframework/zendframework1",
-             "version": "dev-master",
 -            "version": "1.12.17",
++            "version": "1.12.18",
              "source": {
                  "type": "git",
 -                "url": "https://github.com/zendframework/zf1.git",
 -                "reference": "9f0bbc8b626bf35030afd766d9a7e506864e8e0b"
 -            },
 -            "dist": {
 -                "type": "zip",
 -                "url": "https://api.github.com/repos/zendframework/zf1/zipball/9f0bbc8b626bf35030afd766d9a7e506864e8e0b",
 -                "reference": "9f0bbc8b626bf35030afd766d9a7e506864e8e0b",
 -                "shasum": ""
 +                "url": "http://git.tine20.org/git/zendframework1",
-                 "reference": "ed4c9e2fbbe062c521fe310164d8d8dd22ba51c8"
++                "reference": "ac1c8368339fbc360ce469d5a328043ecb521160"
              },
              "require": {
 -                "php": ">=5.2.11"
 -            },
 -            "require-dev": {
 -                "phpunit/dbunit": "1.3.*",
 -                "phpunit/phpunit": "3.7.*"
 -            },
 -            "type": "library",
 -            "extra": {
 -                "branch-alias": {
 -                    "dev-master": "1.12.x-dev"
 -                }
 +                "php": ">=5.3.0"
              },
 +            "type": "project",
              "autoload": {
                  "psr-0": {
 -                    "Zend_": "library/"
 +                    "Zend_": [
 +                        "library/"
 +                    ]
                  }
              },
 -            "notification-url": "https://packagist.org/downloads/",
 -            "include-path": [
 -                "library/"
 -            ],
              "license": [
 -                "BSD-3-Clause"
 -            ],
 -            "description": "Zend Framework 1",
 -            "homepage": "http://framework.zend.com/",
 -            "keywords": [
 -                "ZF1",
 -                "framework"
 +                "New BSD License"
              ],
 -            "time": "2015-11-23 15:11:10"
 +            "description": "Metaways Infosystems GmbH - Patched Zendframework1",
-             "time": "2016-07-04 10:56:42"
++            "time": "2016-07-04 10:55:28"
          }
      ],
      "packages-dev": [