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

Merge branch 'master' into PHRAS-3047_front_of_tools_metadatas_tab

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-05-04 17:43:14 +04:00
committed by GitHub
parent b4eebb4e4f 06963f0615
commit eb15932d8f
3 changed files with 7 additions and 5 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.187-d",
"phraseanet-production-client": "0.34.189-d",
"requirejs": "^2.3.5",
"tinymce": "^4.0.28",
"underscore": "^1.8.3",

2
templates/web/prod/index.html.twig
View File

@@ -995,6 +995,8 @@
<div id="dialog_publicator" title="{{ 'action : bridge' | trans }}" style="display:none;"></div>
<div id="modal_feed" title="{{ 'action : publier' | trans }}" style="display:none;"></div>
<div id="dialog_dwnl" title="{{ 'action : exporter' | trans }}" style="display:none;"></div>
<input type="hidden" id="default-video-chapter-label" value="{{ 'prod::videoTools:chapterTitle' | trans }}"/>
<script type="text/javascript" id="bitly_loader"></script>
<script type="text/javascript">
$(document).ready(function(){

8
yarn.lock
View File

@@ -7578,10 +7578,10 @@ phraseanet-common@^0.4.5-d:
js-cookie "^2.1.0"
pym.js "^1.3.1"
phraseanet-production-client@0.34.187-d:
version "0.34.187-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.187-d.tgz#4b1fc48c5968540ae8d96a840aa9775aab9ef17c"
integrity sha512-IRK35vuVb2JjElud8fuCUKrNKFOdB9FLadDDoEwZoI5JVHRWYuOoIUn2WBuBKvDP2G7rwcS8A2E8iN4iWODYsQ==
phraseanet-production-client@0.34.189-d:
version "0.34.189-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.189-d.tgz#eb6f34fd1ddbc85a1498fb418ca6818936a5fc13"
integrity sha512-iffPvnkhQaOI/HoXFJYSYes6M+YnmC3sBfC+qJl7KxyLSN8yYHeJaso/nCDn0ahZKHuE+0ghoRiBzSZdRma11A==
dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6"