antadis/bebeboutik-api
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of gitlab.antadis.net:mobile-antadis/api-bbb

Browse Source
This commit is contained in:
Christophe Latour 2017-08-23 17:05:27 +02:00
commit 056fb8512d
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
composer.json
View File

@ -8,8 +8,8 @@
"require": {
"php": ">=5.6.4",
"laravel/lumen-framework": "5.4.*",
"antadis/auth-provider-wsse": "0.1.*",
"antadis/api-front" : "0.2.*",
"antadis/auth-provider-wsse": "dev-master",
"antadis/api-front" : "dev-master",
"barryvdh/laravel-cors": "^0.9.2"
},
"require-dev": {
@ -35,6 +35,14 @@
"minimum-stability": "dev",
"prefer-stable": true,
"repositories": [
{
"type": "vcs",
"url": "git@gitlab.antadis.net:ng/api-front-core.git"
},
{
"type": "vcs",
"url": "git@gitlab.antadis.net:ng/auth-provider-wsse.git"
},
{
"type": "composer",
"url": "https://gitlab-composer.antadis.net/"

23
composer.lock generated
View File

@ -4,16 +4,16 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "b7654a7c50f5afdd4d9951061bcfd68f",
"content-hash": "38139e4de37896a3600f5a9b91bc22f2",
"hash": "4b34cadbfca9ee672113e81149d3d1bb",
"content-hash": "a3a879152a05db699b5b0d5a9e9da38e",
"packages": [
{
"name": "antadis/api-front",
"version": "0.2.1",
"version": "dev-master",
"source": {
"type": "git",
"url": "git@gitlab.antadis.net:ng/api-front-core.git",
"reference": "e19adc95e5952cacdf2497abae0c9ec30bbad4ec"
"reference": "f949844c832ffc2d82b83b5cc3a210707c0c77f2"
},
"require": {
"php": ">=5.3"
@ -38,11 +38,12 @@
"lumen",
"prestashop",
"webservice"
]
],
"time": "2017-08-23 14:37:28"
},
{
"name": "antadis/auth-provider-wsse",
"version": "0.1.1",
"version": "dev-master",
"source": {
"type": "git",
"url": "git@gitlab.antadis.net:ng/auth-provider-wsse.git",
@ -69,7 +70,8 @@
"api",
"auth",
"provider"
]
],
"time": "2017-08-16 10:57:54"
},
{
"name": "antadis/security-wsse",
@ -2446,7 +2448,7 @@
],
"authors": [
{
"name": "Mario Bašić",
"name": "Mario Basic",
"email": "mario.basic@outlook.com"
}
],
@ -3913,7 +3915,10 @@
],
"aliases": [],
"minimum-stability": "dev",
"stability-flags": [],
"stability-flags": {
"antadis/auth-provider-wsse": 20,
"antadis/api-front": 20
},
"prefer-stable": true,
"prefer-lowest": false,
"platform": {