Merge branch '6.0' into contributing-docs-add-netlify-site

plone · Oct 20, 2023 · 356b8a9 · 356b8a9
2 parents 2009dc7 + e84da03
commit 356b8a9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/submodules/plone.api b/submodules/plone.api
diff --git a/submodules/plone.restapi b/submodules/plone.restapi
diff --git a/submodules/volto b/submodules/volto
+1 −0		news/518.internal
+36 −37		src/plone/api/tests/test_content.py
+16 −15		.github/workflows/tests.yml
+33 −3		CHANGES.rst
+0 −2		base.cfg
+0 −2		news/1.bugfix
+0 −1		news/1703.internal
+0 −1		news/1718.documentation
+0 −2		news/1720.internal
+2 −1		plone-5.2.x.cfg
+6 −0		plone-6.0.x.cfg
+2 −1		setup.py
+3 −0		src/plone/restapi/services/linkintegrity/get.py
+4 −0		src/plone/restapi/services/multilingual/configure.zcml
+161 −1		src/plone/restapi/tests/test_services_linkintegrity.py
+28 −0		src/plone/restapi/tests/test_translations.py
+11 −0		CHANGELOG.md
+27 −5		cypress/tests/core/blocks/blocks-search.js
+1 −0		news/5298 bugfix
+1 −1		package.json
+1 −1		packages/volto-slate/package.json
+47 −13		src/components/manage/Blocks/Search/hocs/withSearch.jsx
+6 −2		src/components/manage/Widgets/QueryWidget.jsx