Merge remote-tracking branch 'origin/main' into 3716-improve-validation-of-IdWidget

tedw87 · tedw87 · commit 2f38ee0c7a37 · 2024-01-25T17:12:59.000+02:00
diff --git a/packages/registry/CHANGELOG.md b/packages/registry/CHANGELOG.md
@@ -8,6 +8,12 @@
 
 <!-- towncrier release notes start -->
 
+## 1.2.1 (2024-01-17)
+
+### Bugfix
+
+- Fix order of preference in addons-registry for the theme definition (THEME, volto.config.js, package.json) @sneridagh [#5649](https://github.com/plone/volto/issues/5649)
+
 ## 1.2.0 (2024-01-02)
 
 ### Feature
diff --git a/packages/registry/news/5649.bugfix b/packages/registry/news/5649.bugfix
diff --git a/packages/registry/package.json b/packages/registry/package.json
@@ -9,7 +9,7 @@
   ],
   "funding": "https://github.com/sponsors/plone",
   "license": "MIT",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/plone/volto.git"
diff --git a/packages/volto-slate/CHANGELOG.md b/packages/volto-slate/CHANGELOG.md
@@ -8,6 +8,12 @@
 
 <!-- towncrier release notes start -->
 
+## 18.0.0-alpha.6 (2024-01-25)
+
+### Bugfix
+
+- Fix code button in slate. @pbauer [#5668](https://github.com/plone/volto/issues/5668)
+
 ## 18.0.0-alpha.5 (2023-12-13)
 
 ### Feature
diff --git a/packages/volto-slate/news/5668.bugfix b/packages/volto-slate/news/5668.bugfix
diff --git a/packages/volto-slate/package.json b/packages/volto-slate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@plone/volto-slate",
-  "version": "18.0.0-alpha.5",
+  "version": "18.0.0-alpha.6",
   "description": "Slate.js integration with Volto",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@plone/volto-slate",`
`3`		`- "version": "18.0.0-alpha.5",`
	`3`	`+ "version": "18.0.0-alpha.6",`
`4`	`4`	`"description": "Slate.js integration with Volto",`
`5`	`5`	`"main": "src/index.js",`
`6`	`6`	`"author": "European Environment Agency: IDM2 A-Team",`