mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 09:53:15 +00:00
Merge branch 'master' into PHRAS-3160-thesaurus-populate
This commit is contained in:
@@ -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.241-d",
|
"phraseanet-production-client": "0.34.248-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",
|
||||||
|
@@ -92,7 +92,9 @@
|
|||||||
</video>
|
</video>
|
||||||
|
|
||||||
</div>
|
</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 id="thumb_camera_button"></div>
|
||||||
|
|
||||||
<div class="vertical-divider"></div>
|
<div class="vertical-divider"></div>
|
||||||
|
@@ -45,7 +45,7 @@
|
|||||||
<label for="feed_add_title"><b>{{ 'publication : titre' | trans }}</b> <span>( {{ 'publication : title warning' | trans }} )</span></label>
|
<label for="feed_add_title"><b>{{ 'publication : titre' | trans }}</b> <span>( {{ 'publication : title warning' | trans }} )</span></label>
|
||||||
<input class="required_text input-block-level" style="max-width:500px" type="text" name="title" id="feed_add_title" value="{{title}}" />
|
<input class="required_text input-block-level" style="max-width:500px" type="text" name="title" id="feed_add_title" value="{{title}}" />
|
||||||
<label><span class="feed_title_warning feed_warning">{{ 'publication : title alert' | trans }}</span></label>
|
<label><span class="feed_title_warning feed_warning">{{ 'publication : title alert' | trans }}</span></label>
|
||||||
<label for="feed_add_subtitle"><b>{{ 'publication : sous titre' | trans }}</b> <span class="feed_subtitle_warning feed_warning">{{ 'publication : subtitle warning' | trans }}</span></label>
|
<label for="feed_add_subtitle"><b>{{ 'publication : sous titre' | trans }}</b> <span>( {{ 'publication : subtitle warning' | trans }} )</span></label>
|
||||||
<textarea id="feed_add_subtitle" style="max-width:500px" class="input-block-level" name="subtitle" rows="5">{{desc}}</textarea>
|
<textarea id="feed_add_subtitle" style="max-width:500px" class="input-block-level" name="subtitle" rows="5">{{desc}}</textarea>
|
||||||
<label><span class="feed_subtitle_warning feed_warning">{{ 'publication : subtitle alert' | trans }}</span></label>
|
<label><span class="feed_subtitle_warning feed_warning">{{ 'publication : subtitle alert' | trans }}</span></label>
|
||||||
<label for="feed_add_author_name"><b>{{ 'publication : autheur' | trans }}</b></label>
|
<label for="feed_add_author_name"><b>{{ 'publication : autheur' | trans }}</b></label>
|
||||||
|
@@ -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.241-d:
|
phraseanet-production-client@0.34.248-d:
|
||||||
version "0.34.241-d"
|
version "0.34.248-d"
|
||||||
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.241-d.tgz#a23d12ccb8f41ee86bb6acb4c56524c0415090fa"
|
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.248-d.tgz#92b23159cff6437b9aba0a2a9cbc63979b4c68c6"
|
||||||
integrity sha512-iEnl9MIPNM6+9ZYn0J6OB6SWABql94xMPfL/Mi3NKQbK8UQumKK2styQmuiDRTgdGjdyyUo+B+96KlMuiS/L6w==
|
integrity sha512-DgIToC7zdKBIvH47Rr2fceMJT4Aj8WQcHftEBqqFVTH/qQ4kLFMOZqR6aTezwlHms11opZ5s5CFVvM3kkVqa/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"
|
||||||
|
Reference in New Issue
Block a user