Merge branch '6.0' into classic-ui-theming-reorg-1645

plone · Feb 16, 2025 · 717bc7c · 717bc7c
2 parents 5128263 + ec6ffda
commit 717bc7c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/submodules/plone.restapi b/submodules/plone.restapi
diff --git a/submodules/volto b/submodules/volto
+1 −0		news/1192.bugfix
+1 −0		news/1879.bugfix
+24 −20		src/plone/restapi/deserializer/dxfields.py
+0 −3		src/plone/restapi/search/handler.py
+1 −0		src/plone/restapi/serializer/configure.zcml
+4 −1		src/plone/restapi/serializer/converters.py
+16 −0		src/plone/restapi/serializer/dxfields.py
+86 −0		src/plone/restapi/tests/test_dxfield_publication.py
+6 −0		docs/source/_static/link.svg
+1 −1		docs/source/blocks/block-style-wrapper.md
+14 −0		docs/source/user-manual/blocks.md
+5 −2		packages/volto/cypress/support/commands.js
+1 −0		packages/volto/news/5755.documentation
+1 −0		packages/volto/news/6561.bugfix
+1 −0		packages/volto/news/6755.internal
+14 −1		packages/volto/src/express-middleware/sitemap.js
+9 −2		packages/volto/src/helpers/Sitemap/Sitemap.js