hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 18:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into PHRAS-2620-Prod-facet-change-icon

Browse Source
This commit is contained in:
Nicolas Maillat
2019-06-25 11:28:45 +02:00
committed by GitHub
parent 3dc4feade8 6f7c52fed6
commit 47d71d6f2c
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -47,7 +47,7 @@
"php": ">=5.5.9", "php": ">=5.5.9",
"ext-intl": "*", "ext-intl": "*",
"alchemy-fr/tcpdf-clone": "~6.0", "alchemy-fr/tcpdf-clone": "~6.0",
"alchemy/embed-bundle": "^2.0.4", "alchemy/embed-bundle": "^2.0.5",
"alchemy/geonames-api-consumer": "~0.1.0", "alchemy/geonames-api-consumer": "~0.1.0",
"alchemy/mediavorus": "^0.4.4", "alchemy/mediavorus": "^0.4.4",
"alchemy/oauth2php": "1.1.0", "alchemy/oauth2php": "1.1.0",

14
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "a40bfa0aa6310530dc0c92b141b21305", "content-hash": "a9c7fed873d5bfe962c81d543b33330f",
"packages": [ "packages": [
{ {
"name": "alchemy-fr/tcpdf-clone", "name": "alchemy-fr/tcpdf-clone",
@@ -131,16 +131,16 @@
}, },
{ {
"name": "alchemy/embed-bundle", "name": "alchemy/embed-bundle",
"version": "2.0.4", "version": "2.0.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/alchemy-fr/embed-bundle.git", "url": "https://github.com/alchemy-fr/embed-bundle.git",
"reference": "b510748686c05c0c1d59b7ad15e2c1098abafc5a" "reference": "99a701d1a201bbe79e7c6c20a0797c5e9182a001"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/b510748686c05c0c1d59b7ad15e2c1098abafc5a", "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/99a701d1a201bbe79e7c6c20a0797c5e9182a001",
"reference": "b510748686c05c0c1d59b7ad15e2c1098abafc5a", "reference": "99a701d1a201bbe79e7c6c20a0797c5e9182a001",
"shasum": "" "shasum": ""
}, },
"require-dev": { "require-dev": {
@@ -178,10 +178,10 @@
], ],
"description": "Embed resources bundle", "description": "Embed resources bundle",
"support": { "support": {
"source": "https://github.com/alchemy-fr/embed-bundle/tree/2.0.4", "source": "https://github.com/alchemy-fr/embed-bundle/tree/2.0.5",
"issues": "https://github.com/alchemy-fr/embed-bundle/issues" "issues": "https://github.com/alchemy-fr/embed-bundle/issues"
}, },
"time": "2019-06-03T13:35:50+00:00" "time": "2019-06-20T13:32:05+00:00"
}, },
{ {
"name": "alchemy/geonames-api-consumer", "name": "alchemy/geonames-api-consumer",

2
package.json
View File

@@ -65,7 +65,7 @@
"normalize-css": "^2.1.0", "normalize-css": "^2.1.0",
"npm": "^6.0.0", "npm": "^6.0.0",
"npm-modernizr": "^2.8.3", "npm-modernizr": "^2.8.3",
"phraseanet-production-client": "0.34.31-d", "phraseanet-production-client": "0.34.35-d",
"requirejs": "^2.3.5", "requirejs": "^2.3.5",
"tinymce": "^4.0.28", "tinymce": "^4.0.28",
"underscore": "^1.8.3", "underscore": "^1.8.3",

8
yarn.lock
View File

@@ -7560,10 +7560,10 @@ phraseanet-common@^0.4.1:
js-cookie "^2.1.0" js-cookie "^2.1.0"
pym.js "^1.3.1" pym.js "^1.3.1"
phraseanet-production-client@0.34.31-d: phraseanet-production-client@0.34.35-d:
version "0.34.31-d" version "0.34.35-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.31-d.tgz#c53d48d6d8eb407e42515c7d03f089b3559afb05" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.35-d.tgz#910c8e371f672a9f6d54202c07da6dc3449c5c74"
integrity sha512-6jM2op1OT3uCXCb7biRBN3sZDl81T1bSapzuh6klfYYpPBgQocB29YF5Scv+8oyZfzZWEYoj0+dXgfu2CYweBg== integrity sha512-QvWcn43HJSFBin1vOdWhQWReEUxvopIBUdeVf+m8knFQ/AkxpsrZVBGMsBHfXJe3OyNgo+Ulb+vFa9cRM7XY/w==
dependencies: dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2" "@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6" "@turf/turf" "^5.1.6"