Merge pull request #3554 from alchemy-fr/PHRAS-3157_prod_video_tools

PHRAS-3157 merge Prod - Video Tools - Thumbnail tab - some fix
This commit is contained in:
Nicolas Maillat
2020-07-03 16:53:33 +02:00
committed by GitHub
3 changed files with 8 additions and 6 deletions

View File

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

View File

@@ -92,7 +92,9 @@
</video>
</div>
<div class="videotools-spinner ui-widget-overlay ui-front hidden" id="videotools-spinner" style="opacity: 0.9">
<img src="/assets/common/images/icons/loading.svg" alt="" id="gif-loader">
</div>
<div id="thumb_camera_button"></div>
<div class="vertical-divider"></div>

View File

@@ -7678,10 +7678,10 @@ phraseanet-common@^0.4.5-d:
js-cookie "^2.1.0"
pym.js "^1.3.1"
phraseanet-production-client@0.34.241-d:
version "0.34.241-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.241-d.tgz#a23d12ccb8f41ee86bb6acb4c56524c0415090fa"
integrity sha512-iEnl9MIPNM6+9ZYn0J6OB6SWABql94xMPfL/Mi3NKQbK8UQumKK2styQmuiDRTgdGjdyyUo+B+96KlMuiS/L6w==
phraseanet-production-client@0.34.245-d:
version "0.34.245-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.245-d.tgz#0b41cd14c206c1f0cb966da87a1fd3e0104e1f1f"
integrity sha512-ydfaWpBgFTv6uQER3M9kcFBoF10H5UktGn/FpJVCBEZMVIPfPVjOaGNXJYzhGR/2qJUhOBcvIEzyQtYGRmxG7A==
dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6"