Jelajahi Sumber

Merge master

gabriel 7 tahun lalu
induk
melakukan
1e060ad94e
2 mengubah file dengan 18 tambahan dan 18 penghapusan
  1. 1 1
      composer.json
  2. 17 17
      composer.lock

+ 1 - 1
composer.json

@@ -130,7 +130,7 @@
         "doctrine/doctrine-migrations-bundle": "^1.2",
         "doctrine/orm": "^2.5",
         "ik/audit-bundle": "dev-master",
-        "ik/base-admin-bundle": "dev-FD3-219",
+        "ik/base-admin-bundle": "dev-master",
         "ik/device-bundle": "dev-master",
         "ik/extra-data-bundle": "dev-master",
         "ik/leaflet-bundle": "dev-master",

+ 17 - 17
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "996b0244d2feb78b910eefd08fc66be5",
+    "content-hash": "c39555fed705eb16cf4fd7c165305775",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1440,11 +1440,11 @@
         },
         {
             "name": "ik/base-admin-bundle",
-            "version": "dev-FD3-219",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "c464270a94b36c19ad7bf5ef4d5a5af38e3bb526"
+                "reference": "091097f2a95ee2bb1fa624544a96592088c5008d"
             },
             "type": "library",
             "autoload": {
@@ -1459,7 +1459,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-10-02T19:03:26+00:00"
+            "time": "2017-10-10T14:03:21+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -1467,7 +1467,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
-                "reference": "d4d949b8a992ad55adfd6b42841b93bc9bab6f9c"
+                "reference": "46120d9bc82158608428664b67ee08eb8bfc8f82"
             },
             "type": "library",
             "autoload": {
@@ -1482,7 +1482,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2017-10-02T15:25:40+00:00"
+            "time": "2017-10-03T13:20:41+00:00"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1715,7 +1715,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "b4e551f9c89f83cc994a771767d36daee6e433cd"
+                "reference": "c202e1ab1dd51229d04d3156e2adddb2b018df94"
             },
             "require": {
                 "ext-curl": "*",
@@ -1728,7 +1728,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2017-10-02T14:25:11+00:00"
+            "time": "2017-10-09T19:02:17+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -2333,7 +2333,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102",
                 "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102",
-                "shasum": ""
+                "shasum": "37b52563a4ae05716e8477fc781cb03e50599a8f"
             },
             "require": {
                 "php": ">=5.4.0"
@@ -2820,7 +2820,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
                 "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
-                "shasum": ""
+                "shasum": "4539a1a703f4610530726a583389f6e85bf38a07"
             },
             "require": {
                 "php": ">=5.5"
@@ -3016,7 +3016,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073",
                 "reference": "93d39f1f7f9326d746203c7c056f300f7f126073",
-                "shasum": ""
+                "shasum": "f79466e27f8deee75a60d0b4fd98db55eacf9cc3"
             },
             "require": {
                 "doctrine/instantiator": "^1.0.2",
@@ -3142,7 +3142,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
                 "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
-                "shasum": ""
+                "shasum": "d3ce5a919fe743126f331988b9a0f7b8302b999a"
             },
             "require": {
                 "php": ">=5.3.3"
@@ -3189,7 +3189,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
                 "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
+                "shasum": "4122b00281fc98e1733bd9ca446002393c452f84"
             },
             "require": {
                 "php": ">=5.3.3"
@@ -3230,7 +3230,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
                 "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "shasum": ""
+                "shasum": "f67f992aca05457e1e21f619250770b09092ff7b"
             },
             "require": {
                 "php": "^5.3.3 || ^7.0"
@@ -3613,7 +3613,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
                 "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-                "shasum": ""
+                "shasum": "8470a6b3ca913a110aa2580255552a06e995710c"
             },
             "require": {
                 "php": "^5.6 || ^7.0"
@@ -4041,7 +4041,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
                 "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "shasum": ""
+                "shasum": "248cd12206b575057bf0b19f306d92a2f818dfb1"
             },
             "require": {
                 "php": ">=5.6.0"
@@ -4083,7 +4083,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
                 "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "shasum": ""
+                "shasum": "dff8de471afebba9fc6837bb8c886ddc7ebe41bb"
             },
             "require": {
                 "php": ">=5.6"