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

PHRAS-2868

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-01-07 19:02:33 +04:00
parent c7acefdb6e
commit d57901e0b0
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
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.90-d",
"phraseanet-production-client": "0.34.92-d",
"requirejs": "^2.3.5",
"tinymce": "^4.0.28",
"underscore": "^1.8.3",

4
templates/web/prod/actions/Tools/videoEditor.html.twig
View File

@@ -115,7 +115,9 @@
<div class="frame_canva">
<div id="thumb_delete_button"/>
<div id="thumb_download_button"/>
<canvas id="thumb_canvas"></canvas>
<div class="canvas-wrap">
<canvas id="thumb_canvas"></canvas>
</div>
<div id="alt_canvas_container"
style="position:absolute;overflow:hidden;top:-1200px;visibility: hidden; width:0!important;height:0!important">
{% for subdef in outputFormats %}

8
yarn.lock
View File

@@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d:
js-cookie "^2.1.0"
pym.js "^1.3.1"
phraseanet-production-client@0.34.90-d:
version "0.34.90-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.90-d.tgz#e3bac60a8a97476e0de3b6654417fa9a7ecf5a5f"
integrity sha512-UpgYXdfLZLUs8CIVntuMN7dpXHGtk6wwkg/3ofQJHoBw6Y3MjU6L90p1ALKDjAYR/lnVfZNfUn0bWEYxnO0ILQ==
phraseanet-production-client@0.34.92-d:
version "0.34.92-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.92-d.tgz#bfe36241d9ebe05ee8f117b1db55ac4960289c1d"
integrity sha512-IWMlCvGLVXQTTe6sZGJJO/Kkxu9i1j+UtnSyGPGdgzq8dPo6vGhZIX54qz2fnKtg474KgxSxYuwBQmHdam3ddQ==
dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6"