Merge branch 'main' into add-likes

Author: iFlameing

Makefile

@@ -94,6 +94,15 @@ backend-create-site: ## Create a Plone site with default content
 backend-update-example-content: ## Export example content inside package
 	$(MAKE) -C "./backend/" update-example-content
 
+.PHONY: backend-update-example-content-bug-workaround
+backend-update-example-content-bug-workaround: ## Export example content inside package
+	# portlets.json always changes without any actual content amendments
+	git checkout origin/main backend/src/kitconcept/intranet/distributions/intranet/content/portlets.json
+	# RSS block example content is deleted without any actual deletion
+	git checkout origin/main backend/src/kitconcept/intranet/distributions/intranet/content/content/7c7cf1aae1a9431db3a706615a410cdc/data.json
+	# "remoteUrl" starts with "http://nohost/" (https://github.com/plone/plone.exportimport/issues/73)
+	git checkout origin/main backend/src/kitconcept/intranet/distributions/intranet/content/content/195d96ca9952493cbffa69cda040b8b3/data.json
+
 .PHONY: backend-delete-and-create-site
 backend-delete-and-create-site: ## Remove all content and create site
 	$(MAKE) -C "./backend/" remove-data

backend/Dockerfile.acceptance

@@ -35,6 +35,7 @@ RUN --mount=type=cache,target=/root/.cache \
         --no-editable
 
 # Move skeleton files to /app
+ENV SITE_DEFAULT_LANGUAGE=en
 RUN <<EOT
     mv /app_base/* /app
     rm -Rf /app_base

backend/Makefile

@@ -104,7 +104,7 @@ update-example-content: $(VENV_FOLDER) ## Export example content inside package
 .PHONY: cleanup-example-content
 cleanup-example-content: $(VENV_FOLDER) ## Remove invalid references to http://nohost/Plone
 	@echo "$(GREEN)==> Remove invalid references to http://nohost/Plone $(RESET)"
-	@find $(EXAMPLE_CONTENT_FOLDER)/content -type f -name 'data.json' -exec sed -i 's/http:\/\/nohost\/Plone\//\//' {} \;
+	@find $(EXAMPLE_CONTENT_FOLDER)/content -type f -name 'data.json' -exec sed -i '' -e 's#http://nohost/Plone/#/#g' {} \;
 
 # QA
 .PHONY: lint

backend/news/+core1a22.bugfix

@@ -0,0 +1 @@
+Fixed regression in person grid teasers in edit mode. @sneridagh

backend/news/+core1a23.bugfix

@@ -0,0 +1 @@
+Fixed slider flag position in simple variant, and calendar block icon. @sneridagh

backend/news/+example_org.internal

@@ -0,0 +1 @@
+Add example content for organisational unit. @tisto

backend/news/+german.feature

@@ -0,0 +1 @@
+Create new sites in German by default. @davisagli

backend/news/+logo.bugfix

@@ -0,0 +1 @@
+Fix setting the logo on the Plone site root `logo` field. @ericof

backend/news/+profilepic.bugfix

@@ -0,0 +1 @@
+Change name of person_picture_aspect_ratio setting. @sneridagh

backend/news/+registry.bugfix

@@ -0,0 +1 @@
+Fix registry settings after site creation. @ericof