From dfb0436bed507c2344102a30f7b7141557fac69c Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 3 Jul 2020 15:15:37 +0400 Subject: [PATCH 1/5] PHRAS-3163 Publications fix #time 2h --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b5ea0bc3e0..4eac67cdbb 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.241-d", + "phraseanet-production-client": "0.34.244-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/yarn.lock b/yarn.lock index 9dc24ab682..f6c11c1f96 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7678,10 +7678,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.241-d: - version "0.34.241-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.241-d.tgz#a23d12ccb8f41ee86bb6acb4c56524c0415090fa" - integrity sha512-iEnl9MIPNM6+9ZYn0J6OB6SWABql94xMPfL/Mi3NKQbK8UQumKK2styQmuiDRTgdGjdyyUo+B+96KlMuiS/L6w== +phraseanet-production-client@0.34.244-d: + version "0.34.244-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.244-d.tgz#ce0e8a9b05978252138e42c928b330c3f9a62c11" + integrity sha512-X7qcLEkkphTKCFXMZpMYZqdmYKvxr81cU/m7afueBNwXZ1upgtOfOVatj4uvngYPCsV9mkWY8jQTsBwiU2rZjg== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From 21deba424f28724e60647692fc1713b6018503c3 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 3 Jul 2020 17:31:57 +0400 Subject: [PATCH 2/5] PHRAS-3163 rebase branch --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 4eac67cdbb..d08c851766 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.244-d", + "phraseanet-production-client": "0.34.246-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/yarn.lock b/yarn.lock index f6c11c1f96..3089310a82 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7678,10 +7678,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.244-d: - version "0.34.244-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.244-d.tgz#ce0e8a9b05978252138e42c928b330c3f9a62c11" - integrity sha512-X7qcLEkkphTKCFXMZpMYZqdmYKvxr81cU/m7afueBNwXZ1upgtOfOVatj4uvngYPCsV9mkWY8jQTsBwiU2rZjg== +phraseanet-production-client@0.34.246-d: + version "0.34.246-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.246-d.tgz#9213410f02f665b342b2c27f747f25d518a6666b" + integrity sha512-Hj2b3ytc9e1IUNgm6F+T29i5mPTljcMZoQ4eVCy9fDuInfKh+KsxFEROpv5621+LfGAUbCt8HIONCC9OMRPhXA== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From f29771693abc329191f498aa4326ad14c2a45e9b Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 3 Jul 2020 19:18:20 +0400 Subject: [PATCH 3/5] PHRAS-3163 upgrade phraseanet-production-client --- package.json | 2 +- yarn.lock | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index d08c851766..64e0d72e96 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.246-d", + "phraseanet-production-client": "../Phraseanet-production-client", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/yarn.lock b/yarn.lock index 3089310a82..cbf02f2eb1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5359,10 +5359,14 @@ jquery-simplecolorpicker@^0.3.1: resolved "https://registry.yarnpkg.com/jquery-simplecolorpicker/-/jquery-simplecolorpicker-0.3.1.tgz#4f6befd380ab05470f585d5482e5180556e460eb" integrity sha1-T2vv04CrBUcPWF1UguUYBVbkYOs= -"jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git", "jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e": +"jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e": + version "1.4.2" + resolved "git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e" + +"jquery-treeview@https://github.com/alchemy-fr/jquery-treeview.git": version "1.4.2" uid "1e9e5a49d2875b878801e904cd08c2d25e85af1e" - resolved "git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e" + resolved "https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e" jquery-ui-datepicker-with-i18n@^1.10.4: version "1.10.4" @@ -7678,10 +7682,8 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.246-d: - version "0.34.246-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.246-d.tgz#9213410f02f665b342b2c27f747f25d518a6666b" - integrity sha512-Hj2b3ytc9e1IUNgm6F+T29i5mPTljcMZoQ4eVCy9fDuInfKh+KsxFEROpv5621+LfGAUbCt8HIONCC9OMRPhXA== +phraseanet-production-client@../Phraseanet-production-client: + version "0.34.247-d" dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From 93575c7a3b4cceeaf23097354132750a22cdd291 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 3 Jul 2020 19:29:45 +0400 Subject: [PATCH 4/5] PHRAS-3163 --- package.json | 2 +- yarn.lock | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 64e0d72e96..c51d6fd6f8 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": "../Phraseanet-production-client", + "phraseanet-production-client": "0.34.248-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/yarn.lock b/yarn.lock index cbf02f2eb1..43cc3ddc1c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5359,14 +5359,10 @@ jquery-simplecolorpicker@^0.3.1: resolved "https://registry.yarnpkg.com/jquery-simplecolorpicker/-/jquery-simplecolorpicker-0.3.1.tgz#4f6befd380ab05470f585d5482e5180556e460eb" integrity sha1-T2vv04CrBUcPWF1UguUYBVbkYOs= -"jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e": - version "1.4.2" - resolved "git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e" - -"jquery-treeview@https://github.com/alchemy-fr/jquery-treeview.git": +"jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git", "jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e": version "1.4.2" uid "1e9e5a49d2875b878801e904cd08c2d25e85af1e" - resolved "https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e" + resolved "git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e" jquery-ui-datepicker-with-i18n@^1.10.4: version "1.10.4" @@ -7682,8 +7678,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@../Phraseanet-production-client: - version "0.34.247-d" +phraseanet-production-client@0.34.248-d: + version "0.34.248-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.248-d.tgz#92b23159cff6437b9aba0a2a9cbc63979b4c68c6" + integrity sha512-DgIToC7zdKBIvH47Rr2fceMJT4Aj8WQcHftEBqqFVTH/qQ4kLFMOZqR6aTezwlHms11opZ5s5CFVvM3kkVqa/w== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From a7254dd81532d314aa05c45423cdc24047c4c536 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 3 Jul 2020 19:45:47 +0400 Subject: [PATCH 5/5] PHRAS-3163 Fix on publication creation --- templates/web/prod/actions/publish/publish.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/web/prod/actions/publish/publish.html.twig b/templates/web/prod/actions/publish/publish.html.twig index db56c040df..b10cbfad90 100644 --- a/templates/web/prod/actions/publish/publish.html.twig +++ b/templates/web/prod/actions/publish/publish.html.twig @@ -45,7 +45,7 @@ - +