From 16477a2a5374a6a1a33931c7e8437112130e9971 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Tue, 12 May 2020 18:40:23 +0400 Subject: [PATCH 1/4] PHRAS-2157 #comment Prod share fix iframe size #time 2h --- templates/web/prod/Share/record.html.twig | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/templates/web/prod/Share/record.html.twig b/templates/web/prod/Share/record.html.twig index ab2b3bd771..6fdecb50d3 100644 --- a/templates/web/prod/Share/record.html.twig +++ b/templates/web/prod/Share/record.html.twig @@ -65,15 +65,19 @@
{#{% if type == 'image' %}#} + {% set embedUrl = subdefList[defKey].embedUrl %} + {% if subdefList[defKey].height == 0 %} + {% set defKey = 'thumbnail' %} + {% endif %} {% spaceless %} {% endspaceless %}

- {{ 'previewLinkLabel' | trans }}    {{ 'copyClipboardLabel' | trans }}

From a23700719507a13bbd204cb39d59bbad4b911eda Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Wed, 13 May 2020 12:55:42 +0400 Subject: [PATCH 2/4] PHRAS-3067 change default value of chapter overlaps --- templates/web/prod/actions/Tools/videoEditor.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/web/prod/actions/Tools/videoEditor.html.twig b/templates/web/prod/actions/Tools/videoEditor.html.twig index a788b2707a..0c70c7c7ba 100644 --- a/templates/web/prod/actions/Tools/videoEditor.html.twig +++ b/templates/web/prod/actions/Tools/videoEditor.html.twig @@ -229,7 +229,7 @@ {% endfor %} ], preferences: { - overlapChapters: {% if overlapChapters != NULL %}{{ overlapChapters }}{% else %}0{% endif %}, + overlapChapters: {% if overlapChapters != NULL %}{{ overlapChapters }}{% else %}1{% endif %}, } }; From fd2f9f75d96009acf0a3f4952efca81bc8f9ce40 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Wed, 13 May 2020 14:42:44 +0400 Subject: [PATCH 3/4] PHRAS-3068 #comment Fix update value of title and subtitle after modification #time 2h --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index fa86794c87..f306c29df2 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "0.34.198-d", + "phraseanet-production-client": "0.34.200-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/yarn.lock b/yarn.lock index 60961644d8..ad6d7657ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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.198-d: - version "0.34.198-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.198-d.tgz#85f736255cc19b21caddd257b41f7edf46973f05" - integrity sha512-uW4iiCxE0r8d8+cK86DMFky5Vc4aYh3mh5seQTSP07S57YONgZ5N7TMhbjAv2Dch4Bs6pobARlnVZz/IvPvY4g== +phraseanet-production-client@0.34.200-d: + version "0.34.200-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.200-d.tgz#109231cc61f7bf5b21a143a2b79bdb66d077ef1b" + integrity sha512-o+FK6M0txy3orz8PaPSSm3XHq4RBrU345hC4AGsBRjjZ9IO+dIOkfNAqRzRgb8NjYFFi3YqlLk2Sl1IarJvnfg== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From 80023b5fe5d1ecacb902fbd725b321936d58cf32 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Wed, 13 May 2020 16:01:42 +0400 Subject: [PATCH 4/4] PHRAS-3068 upgrade phraseanet-production-client --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f306c29df2..64bb7dd864 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "0.34.200-d", + "phraseanet-production-client": "0.34.201-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/yarn.lock b/yarn.lock index ad6d7657ce..66ae825f84 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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.200-d: - version "0.34.200-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.200-d.tgz#109231cc61f7bf5b21a143a2b79bdb66d077ef1b" - integrity sha512-o+FK6M0txy3orz8PaPSSm3XHq4RBrU345hC4AGsBRjjZ9IO+dIOkfNAqRzRgb8NjYFFi3YqlLk2Sl1IarJvnfg== +phraseanet-production-client@0.34.201-d: + version "0.34.201-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.201-d.tgz#c668b8a44761e21b06a0c38362c23749c68d865e" + integrity sha512-7jQH9zv/DMaDmj79240LrdZzShNYpdmGEfhPN3Km1UGd1W0Phs/0kGfW0jB4hWzV1LO1SIRx4A4vIzr6UQVipg== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6"