浏览代码

Se actualizan vendors y se agrega el owner-voter

Maximiliano Schvindt 8 年之前
父节点
当前提交
8c555ec398
共有 4 个文件被更改,包括 44 次插入10 次删除
  1. 1 0
      app/AppKernel.php
  2. 2 1
      app/config/config.yml
  3. 9 1
      composer.json
  4. 32 8
      composer.lock

+ 1 - 0
app/AppKernel.php

@@ -33,6 +33,7 @@ class AppKernel extends Kernel
             new Base\OAuthClientBundle\BaseOAuthClientBundle(),
             new DeviceBundle\DeviceBundle(),
             new ExtraDataBundle\ExtraDataBundle(),
+            new OwnerVoterBundle\OwnerVoterBundle(),
             
             new StatsBundle\StatsBundle(),
         ];

+ 2 - 1
app/config/config.yml

@@ -11,7 +11,8 @@ imports:
     - { resource: "@BaseOAuthClientBundle/Resources/config/hwioauthbundle/config.yml" }
     - { resource: "@WebserviceBundle/Resources/config/services.yml" }
     - { resource: "@ExtraDataBundle/Resources/config/services.yml" }
-    
+    - { resource: "@OwnerVoterBundle/Resources/config/services.yml" }
+   
     - { resource: "@StatsBundle/Resources/config/services.yml" }
 
 # Put parameters here that don't need to change on each machine where the app is deployed

+ 9 - 1
composer.json

@@ -54,6 +54,13 @@
             "options": {
                     "local_pk": "./keys/bitbucket.id_rsa"
             }
+        },
+        {
+            "type": "vcs",
+			"url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/OwnerVoter.git",
+            "options": {
+                    "local_pk": "./keys/bitbucket.id_rsa"
+            }
         }
     ],
     "require": {
@@ -80,7 +87,8 @@
         "ik/oauthclient-bundle": "dev-master",
         "ik/webservice-bundle": "dev-master",
         "ik/device-bundle": "dev-master",
-        "ik/extra-data-bundle": "dev-master"
+        "ik/extra-data-bundle": "dev-master",
+        "ik/owner-voter-bundle": "dev-master"
     },
     "require-dev": {
         "sensio/generator-bundle": "^3.0",

+ 32 - 8
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": "d437b2d7dd14efe56b03f5c0967da8de",
+    "content-hash": "ea46834f1379bc83646db9043b190d8d",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1261,8 +1261,8 @@
             "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "0e78c0ea30184059e6f7065cf9628b8fc228c768"
+                "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
+                "reference": "302ecc3788034546ae8822ac1928891118b14aa3"
             },
             "type": "library",
             "autoload": {
@@ -1277,7 +1277,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-05-08 15:32:19"
+            "time": "2017-06-23 14:24:50"
         },
         {
             "name": "ik/device-bundle",
@@ -1307,7 +1307,7 @@
             "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/ExtraDataBundle.git",
+                "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/ExtraDataBundle.git",
                 "reference": "a5a6158cd382490cafd6510334cc63fc50865a58"
             },
             "type": "library",
@@ -1330,7 +1330,7 @@
             "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
+                "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
                 "reference": "0118134e5c0a4731b2f54328a960756bb83ac32e"
             },
             "require": {
@@ -1352,12 +1352,35 @@
             ],
             "time": "2017-04-06 15:40:13"
         },
+        {
+            "name": "ik/owner-voter-bundle",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/OwnerVoter.git",
+                "reference": "9ae7b65c59f9cb2216b422744a5e1ffbe429ef29"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "OwnerVoterBundle\\": ""
+                }
+            },
+            "description": "Flowdat 3 Owner Voter Bundle",
+            "keywords": [
+                "Admin Generator",
+                "admin",
+                "bundle",
+                "owner-voter"
+            ],
+            "time": "2017-06-12 15:49:24"
+        },
         {
             "name": "ik/webservice-bundle",
             "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/Webservice.git",
+                "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/Webservice.git",
                 "reference": "1c50e96e43fdc76c8a0393d514799675c23f669f"
             },
             "require": {
@@ -5442,7 +5465,8 @@
         "ik/oauthclient-bundle": 20,
         "ik/webservice-bundle": 20,
         "ik/device-bundle": 20,
-        "ik/extra-data-bundle": 20
+        "ik/extra-data-bundle": 20,
+        "ik/owner-voter-bundle": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,