Merge pull request #88 from eea/develop

Release
eea · Nov 2, 2023 · d0f8e85 · d0f8e85
2 parents 41ab7a1 + 545592c
commit d0f8e85
Show file tree

Hide file tree

Showing 6 changed files with 201 additions and 169 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [6.4.0](https://github.com/eea/volto-columns-block/compare/6.3.5...6.4.0) - 2 November 2023
+
+#### :house: Internal changes
+
+- chore: husky, lint-staged use fixed versions [valentinab25 - [`1fc316f`](https://github.com/eea/volto-columns-block/commit/1fc316fe3c99a45e3c9a07917bead63782cef4b4)]
+
+#### :hammer_and_wrench: Others
+
+- Release 6.4.0 [Alin Voinea - [`d88a8cc`](https://github.com/eea/volto-columns-block/commit/d88a8ccd7af8648f22f182016570a9ee5ba69a2f)]
+- Fix margin-bottom inside the columns block [laszlocseh - [`8080e84`](https://github.com/eea/volto-columns-block/commit/8080e843d9ed2604da76d361d65ede5d03446732)]
 ### [6.3.5](https://github.com/eea/volto-columns-block/compare/6.3.4...6.3.5) - 16 October 2023
 
 #### :house: Internal changes
@@ -64,7 +74,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINS] Deprecate circularity website [valentinab25 - [`b535c91`](https://github.com/eea/volto-columns-block/commit/b535c9135bce0dd172e60f7f8af5ebd9fa0c073d)]
 
 #### :hammer_and_wrench: Others
 
@@ -92,12 +101,10 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`5738a85`](https://github.com/eea/volto-columns-block/commit/5738a85810a7fe5ad64d6ae0362ffffa7bbc6bc5)]
 ### [6.1.0](https://github.com/eea/volto-columns-block/compare/6.0.2...6.1.0) - 27 March 2023
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`8e96c96`](https://github.com/eea/volto-columns-block/commit/8e96c967909944e827a1c1a303283c04d76f5db6)]
 ### [6.0.2](https://github.com/eea/volto-columns-block/compare/6.0.1...6.0.2) - 21 February 2023
 
 #### :hammer_and_wrench: Others
@@ -110,25 +117,20 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Release 6.0.0 [Alin Voinea - [`947cd73`](https://github.com/eea/volto-columns-block/commit/947cd730ac967515e8a508924eab6efb3e485196)]
-- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`10b77f7`](https://github.com/eea/volto-columns-block/commit/10b77f765c2f6a42bf5e79cf46b4a48f5eb1f011)]
 ### [5.2.0](https://github.com/eea/volto-columns-block/compare/5.1.0...5.2.0) - 28 December 2022
 
 #### :hammer_and_wrench: Others
 
 - Release 5.2.0 [Alin Voinea - [`7ea7976`](https://github.com/eea/volto-columns-block/commit/7ea7976615b932802aece75d68065fa1b5063676)]
 - test(eslint): Fix lint [Alin Voinea - [`1a5b9af`](https://github.com/eea/volto-columns-block/commit/1a5b9afeec15d998b24e3d9bedaa9c9044a54f9b)]
 - Mock useLocation to fix ColumnsBlockView.test [wesleybl - [`e153a48`](https://github.com/eea/volto-columns-block/commit/e153a481103bc6db74ce19ec536e51cfcd232b6f)]
-- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`e8c0e8b`](https://github.com/eea/volto-columns-block/commit/e8c0e8bc9d65fbd4e454dd5ff0de158c864dd317)]
 - test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`2ae13d2`](https://github.com/eea/volto-columns-block/commit/2ae13d2afdaca0c774b502f716258f6a481d4e49)]
-- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`e880669`](https://github.com/eea/volto-columns-block/commit/e8806694b640a0130bed701bd01f7a4901cff05d)]
 - Don't fail in tests [Tiberiu Ichim - [`6c1dddf`](https://github.com/eea/volto-columns-block/commit/6c1dddf29860762c046393983b52a6609259aa29)]
 ### [5.1.0](https://github.com/eea/volto-columns-block/compare/5.0.1...5.1.0) - 29 November 2022
 
 #### :hammer_and_wrench: Others
 
 - Release 5.1.0 [Alin Voinea - [`4b199b2`](https://github.com/eea/volto-columns-block/commit/4b199b20a79d5ab3e5cad058565de444c6e3c68a)]
-- yarn 3 [Alin Voinea - [`b6993ba`](https://github.com/eea/volto-columns-block/commit/b6993bac1f962be29d719a8bf1e394ff57d9e3cb)]
-- Add Sonarqube tag using demo-kitkat-frontend addons list [EEA Jenkins - [`1d93d8d`](https://github.com/eea/volto-columns-block/commit/1d93d8d343b8b43c8eea763630b5d4476d242a44)]
 ### [5.0.1](https://github.com/eea/volto-columns-block/compare/5.0.0...5.0.1) - 16 November 2022
 
 #### :bug: Bug Fixes
@@ -166,8 +168,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Cleanup [Miu Razvan - [`86e202e`](https://github.com/eea/volto-columns-block/commit/86e202eac4bc6ef4e776e79f62c0f96883848fab)]
 - Cleanup [Alin Voinea - [`1baba7f`](https://github.com/eea/volto-columns-block/commit/1baba7f9959a13eb15070311b6f5f07ce396c84e)]
 - Update dependencies [Alin Voinea - [`976c380`](https://github.com/eea/volto-columns-block/commit/976c380bb1ca2d985b2bfb1a88d2144aa2c11028)]
-- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`d978235`](https://github.com/eea/volto-columns-block/commit/d978235da3ab5dff38faba2673bb9a1afa7012a3)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`c8daea6`](https://github.com/eea/volto-columns-block/commit/c8daea6cad87650895d063c8d852b01d74cfd326)]
 - update(jest): add @plone/volto-slate resolver refs- #153447 [nileshgulia1 - [`50ab9a0`](https://github.com/eea/volto-columns-block/commit/50ab9a0ff903badb677da43d913fd698f031895c)]
 ### [4.5.3](https://github.com/eea/volto-columns-block/compare/4.5.2...4.5.3) - 17 August 2022
 
@@ -181,7 +181,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`bab4f31`](https://github.com/eea/volto-columns-block/commit/bab4f318a773ff4de42f9e1e095a2e7ae39f6b01)]
 ### [4.5.0](https://github.com/eea/volto-columns-block/compare/4.4.15...4.5.0) - 11 April 2022
 
 #### :hammer_and_wrench: Others
@@ -197,8 +196,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`ff71f20`](https://github.com/eea/volto-columns-block/commit/ff71f2020b724e2dca5d5f5467f51fc619d5f404)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`a8becc0`](https://github.com/eea/volto-columns-block/commit/a8becc0159ab140dcf6bb1b2de7429bae81adb78)]
 ### [4.4.14](https://github.com/eea/volto-columns-block/compare/4.4.13...4.4.14) - 21 January 2022
 
 ### [4.4.13](https://github.com/eea/volto-columns-block/compare/4.4.12...4.4.13) - 13 January 2022
@@ -219,14 +216,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`a745845`](https://github.com/eea/volto-columns-block/commit/a745845507ed2a32b4f50280439875e7287793e0)]
 ### [4.4.7](https://github.com/eea/volto-columns-block/compare/4.4.6...4.4.7) - 10 December 2021
 
 #### :hammer_and_wrench: Others
 
 - Refs #142010 - Optimize Volto-addons gitflow pipelines [valentinab25 - [`eccf195`](https://github.com/eea/volto-columns-block/commit/eccf19562860a61812187a4e55dd0f03c6a727d7)]
-- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`a04ee43`](https://github.com/eea/volto-columns-block/commit/a04ee430e1407f3aa39886e98f4f11fcbec70b66)]
-- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`946133c`](https://github.com/eea/volto-columns-block/commit/946133c42004febadf2a1c8d330fbac6f820f160)]
 ### [4.4.6](https://github.com/eea/volto-columns-block/compare/4.4.5...4.4.6) - 14 October 2021
 
 #### :hammer_and_wrench: Others
@@ -236,8 +230,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Add missing 40/60 grid [kreafox - [`c30b33c`](https://github.com/eea/volto-columns-block/commit/c30b33c393062f7ac2a09e3bc181224d3e8f921f)]
 - Add padding for columns [kreafox - [`f945477`](https://github.com/eea/volto-columns-block/commit/f945477cd4150d8a570c26774a8afb3989d6fcba)]
 - Add custom class for columns [kreafox - [`0e4783f`](https://github.com/eea/volto-columns-block/commit/0e4783f44d87c526dc0535874f75d41a85c5cf12)]
-- Add Sonarqube tag using sustainability-frontend addons list [EEA Jenkins - [`35aa796`](https://github.com/eea/volto-columns-block/commit/35aa79635a03778819365873fdad2937e79b4f5f)]
-- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`ab3713a`](https://github.com/eea/volto-columns-block/commit/ab3713a9e696b31f90c57b7e39faab03c767196f)]
 ### [4.4.5](https://github.com/eea/volto-columns-block/compare/4.4.4...4.4.5) - 13 August 2021
 
 #### :hammer_and_wrench: Others
@@ -255,9 +247,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - pretty [Tiberiu Ichim - [`53f1ab7`](https://github.com/eea/volto-columns-block/commit/53f1ab7970018f0a6de5ddf09495d1792320949d)]
 - Fix styles in quanta toolbar [Tiberiu Ichim - [`97cfc46`](https://github.com/eea/volto-columns-block/commit/97cfc46e617bc5a22795817f71b1dd826ed1faf5)]
-- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`b26321b`](https://github.com/eea/volto-columns-block/commit/b26321bdf9eb2e4b5c1282210dfc8faa8849487f)]
-- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`0809fcb`](https://github.com/eea/volto-columns-block/commit/0809fcb4bce8611e5e417aa2222a7e9b40ba5936)]
-- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`36a4df2`](https://github.com/eea/volto-columns-block/commit/36a4df2cd83d48ddc2cefe9946a2c604798b9d6c)]
 ### [4.4.3](https://github.com/eea/volto-columns-block/compare/4.4.2...4.4.3) - 27 May 2021
 
 ### [4.4.2](https://github.com/eea/volto-columns-block/compare/4.4.1...4.4.2) - 29 April 2021
@@ -393,7 +382,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - Release 1.0.0 [Alin Voinea - [`b432244`](https://github.com/eea/volto-columns-block/commit/b43224465fc15096fd41c61eee3f4cadffaed57f)]
 - Update docs [Alin Voinea - [`f698f3c`](https://github.com/eea/volto-columns-block/commit/f698f3ca05b3f5a8f240db409cde4d1ddeeed78b)]
-- yarn prettier [Alin Voinea - [`ae092f6`](https://github.com/eea/volto-columns-block/commit/ae092f6a101857cf068ed639c7d4686722db4d58)]
 ### [0.3.7](https://github.com/eea/volto-columns-block/compare/0.3.6...0.3.7) - 9 November 2020
 
 #### :hammer_and_wrench: Others

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG VOLTO_VERSION
-FROM plone/frontend-builder:${VOLTO_VERSION}
+FROM eeacms/frontend-builder:${VOLTO_VERSION}
 
 ARG ADDON_NAME
 ARG ADDON_PATH