Merge branch 'main' into fix-recursive-copy-container-blocks-on-copy

* main: Make dynamic/live teaser without additional requests (#6024) Fix issue of duplicated blocks upon pasting an image into the Slate E… (#5818) Remove `api` folder. Add `backend` folder using latest backend best practices (#6110) Rename files with wrong extension `js->jsx` when they contain JSX. (#6114) Improve shadowing by including the support for `js->jsx` extensions in… (#6113) issue-5452 markdown shortcut (#5495)
plone · Jun 20, 2024 · 28deebd · 28deebd
2 parents 4df7bae + 3c93951
commit 28deebd
Show file tree

Hide file tree

Showing 70 changed files with 559 additions and 353 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -26,6 +26,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
+          cache-dependency-path: 'requirements-docs.txt'
 
       - name: Create Python virtual environment
         run: pip install virtualenv

diff --git a/Makefile b/Makefile
@@ -222,7 +222,7 @@ start-test-acceptance-frontend-dev: build-deps ## Start the Core Acceptance Fron
 
 .PHONY: start-test-acceptance-server test-acceptance-server
 start-test-acceptance-server test-acceptance-server: ## Start Test Acceptance Server Main Fixture (docker container)
-	docker run -it --rm -p 55001:55001 $(DOCKER_IMAGE_ACCEPTANCE)
+	$(MAKE) -C "./packages/volto/" start-test-acceptance-server
 
 .PHONY: start-test-acceptance-frontend
 start-test-acceptance-frontend: build-deps ## Start the Core Acceptance Frontend Fixture

diff --git a/api/Makefile b/api/Makefile
diff --git a/api/README.rst b/api/README.rst
diff --git a/api/buildout.cfg b/api/buildout.cfg
diff --git a/api/requirements.txt b/api/requirements.txt
diff --git a/api/version-constraints.cfg b/api/version-constraints.cfg
diff --git a/api/versions.cfg b/api/versions.cfg
diff --git a/docs/source/_static/user-manual/blocks/hero-block.png b/docs/source/_static/user-manual/blocks/hero-block.png
diff --git a/docs/source/_static/user-manual/blocks/images-grid-block-manage-images.png b/docs/source/_static/user-manual/blocks/images-grid-block-manage-images.png
diff --git a/docs/source/_static/user-manual/blocks/images-grid-block-number-of-columns.png b/docs/source/_static/user-manual/blocks/images-grid-block-number-of-columns.png
diff --git a/docs/source/_static/user-manual/blocks/teaser-block-configuration.png b/docs/source/_static/user-manual/blocks/teaser-block-configuration.png