From 025a5e6beabe56401333132a4939af47adb80485 Mon Sep 17 00:00:00 2001 From: Lorenzo Natali Date: Thu, 4 Oct 2018 15:03:43 +0200 Subject: [PATCH 1/7] Revert "Removes console logs from browser from karma testing output (#3207)" This reverts commit 264ef587dd044a755f487b307953821c5529d3d6. From 8427d854d19dd623222f84c8c26ece55c255d219 Mon Sep 17 00:00:00 2001 From: Lorenzo Natali Date: Thu, 4 Oct 2018 15:03:43 +0200 Subject: [PATCH 2/7] Revert "Fix #3209 show/hide title translations in layer settings (#3210)" This reverts commit 415e63d07a3150fbb831f539fe7ddbbdb3ae5a24. From 47ecf65daffd69a8755cc52a6e848a0e7d501dc8 Mon Sep 17 00:00:00 2001 From: Lorenzo Natali Date: Thu, 4 Oct 2018 15:03:43 +0200 Subject: [PATCH 3/7] Revert "Fixes #2669: use https version of geosolutions maven repo (#3182)" This reverts commit dc4084c233b08a0763f53818cf392667fa135187. From b7f4df67b0f9b69bc70219b3abf77d503b6460f1 Mon Sep 17 00:00:00 2001 From: Lorenzo Natali Date: Thu, 4 Oct 2018 15:03:43 +0200 Subject: [PATCH 4/7] Revert "Automatic definition of proj codes from configuration in OpenLayers maps (#3133)" This reverts commit 70ee3b97a8ea6090ab75c68f37df391110679476. From 1b8ec855630972251a4a618ff3865930015e857e Mon Sep 17 00:00:00 2001 From: Lorenzo Natali Date: Thu, 4 Oct 2018 15:03:43 +0200 Subject: [PATCH 5/7] Revert "Fix #3192 setting the default layer as object (#3199)" This reverts commit fe5017097998121d8847c7a309f0ccedfabfc9f4. From f96e43a982dd21c6d54649d50a9987585b85b6a6 Mon Sep 17 00:00:00 2001 From: Lorenzo Natali Date: Thu, 4 Oct 2018 15:03:43 +0200 Subject: [PATCH 6/7] Revert "Fix #2298 de-DE translation fix (#3205)" This reverts commit e39348a69f8c841be62b6d5c4e59db6b17b8b7dc. From 44d5aedf6083013e4a1a1013c3cf61df594385e2 Mon Sep 17 00:00:00 2001 From: Lorenzo Natali Date: Thu, 4 Oct 2018 15:03:43 +0200 Subject: [PATCH 7/7] Revert "hiding div to allow playing/showing the video (#3188)" This reverts commit a7c9e667f754a8537c926bee493b40acb9107ee2. --- web/client/components/maps/modals/MetadataModal.jsx | 2 +- web/client/components/misc/quillmodules/ResizeModule.js | 1 - web/client/components/resources/modals/DetailSheet.jsx | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/web/client/components/maps/modals/MetadataModal.jsx b/web/client/components/maps/modals/MetadataModal.jsx index 5c28cce515..189467d504 100644 --- a/web/client/components/maps/modals/MetadataModal.jsx +++ b/web/client/components/maps/modals/MetadataModal.jsx @@ -111,7 +111,7 @@ class MetadataModal extends React.Component { toolbar: [ [{ 'size': ['small', false, 'large', 'huge'] }, 'bold', 'italic', 'underline', 'blockquote'], [{ 'list': 'bullet' }, { 'align': [] }], - [{ 'color': [] }, { 'background': [] }, 'clean'], ['image', 'link', 'video'] + [{ 'color': [] }, { 'background': [] }, 'clean'], ['image', 'link'] ] }, options: {}, diff --git a/web/client/components/misc/quillmodules/ResizeModule.js b/web/client/components/misc/quillmodules/ResizeModule.js index cd02b91881..add94a8db6 100644 --- a/web/client/components/misc/quillmodules/ResizeModule.js +++ b/web/client/components/misc/quillmodules/ResizeModule.js @@ -723,7 +723,6 @@ module.exports = Quill => { iframe.setAttribute('height', height); let overlay = document.createElement('DIV'); overlay.setAttribute('class', 'ms-quill-iframe'); - overlay.style.display = 'none'; overlay.style.overflow = 'hidden'; overlay.style.position = 'absolute'; overlay.style.left = '0'; diff --git a/web/client/components/resources/modals/DetailSheet.jsx b/web/client/components/resources/modals/DetailSheet.jsx index 70d5ca4222..9fb0b08664 100644 --- a/web/client/components/resources/modals/DetailSheet.jsx +++ b/web/client/components/resources/modals/DetailSheet.jsx @@ -23,7 +23,7 @@ module.exports = ({ toolbar: [ [{ 'size': ['small', false, 'large', 'huge'] }, 'bold', 'italic', 'underline', 'blockquote'], [{ 'list': 'bullet' }, { 'align': [] }], - [{ 'color': [] }, { 'background': [] }, 'clean'], ['image', 'link', 'video'] + [{ 'color': [] }, { 'background': [] }, 'clean'], ['image', 'link'] ] }, detailsText,