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

PHRAS-3157 Video tools

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-07-02 19:21:55 +04:00
parent 6ed33888bb
commit d54b2a1e24
4 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", "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.240-d", "phraseanet-production-client": "0.34.243-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",

BIN
resources/www/common/images/loader.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

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

@@ -92,7 +92,9 @@
</video> </video>
</div> </div>
<div class="videotools-spinner ui-widget-overlay ui-front hidden" id="videotools-spinner">
<img width="50" height="50" src="/assets/common/images/loader.gif" alt="" id="gif-loader">
</div>
<div id="thumb_camera_button"></div> <div id="thumb_camera_button"></div>
<div class="vertical-divider"></div> <div class="vertical-divider"></div>

8
yarn.lock
View File

@@ -7678,10 +7678,10 @@ phraseanet-common@^0.4.5-d:
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.240-d: phraseanet-production-client@0.34.243-d:
version "0.34.240-d" version "0.34.243-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.240-d.tgz#81a3902a5258d048544ee763a139361be2728d58" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.243-d.tgz#757a870334d382d60e19e49893740f55ee086d1c"
integrity sha512-P5qGQtvSNIGQgoOJMqxKzch4qb4QXFy10JL1wBiFjGOqRHgAQrzreLOF6z/sJE3TkY+B35MtijDnXWDLRZypwg== integrity sha512-3dplkbR4LOjbBLVkuxicdPcJlawrqQqAx+JZlAc9AIDvhlaCQQENmHz8/Ygb3mWtAFInexPyp/ns9qtpc3H43A==
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"