From 22378f75a6188dfe27bfc750a48f8cfd7d4a7065 Mon Sep 17 00:00:00 2001
From: Fred van Dijk <fredvd@gmail.com>
Date: Thu, 20 Jul 2023 18:08:40 +0200
Subject: [PATCH 1/6] fix concurrency id

---
 .github/workflows/backend-testing.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/backend-testing.yml b/.github/workflows/backend-testing.yml
index 67659dd..d983c5d 100644
--- a/.github/workflows/backend-testing.yml
+++ b/.github/workflows/backend-testing.yml
@@ -143,7 +143,7 @@ jobs:
 
   deploy:
     if: ${{ github.ref == 'refs/heads/main' }}
-    concurrency: testing_deploy
+    concurrency: deploy_testing
     runs-on: ubuntu-latest
     needs:
       - release

From 5fb7d216e0d31600a1fe73d01db578ff49c6c491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Andrei?= <ericof@gmail.com>
Date: Wed, 23 Aug 2023 12:21:33 -0300
Subject: [PATCH 2/6] Update volto-matomo (#27)

* Update matomo

* Update Changelog
---
 CHANGES.rst                                           | 6 ++++++
 frontend/src/addons/volto-conf2023-theme/package.json | 2 +-
 version.txt                                           | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index a3bcf60..852c9dd 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+2023-08-23 1.15
+--------------
+
+- Bump volto-matomo
+  [ericof]
+
 2023-06-19 1.14
 --------------
 
diff --git a/frontend/src/addons/volto-conf2023-theme/package.json b/frontend/src/addons/volto-conf2023-theme/package.json
index df9d2ba..c13f4b8 100644
--- a/frontend/src/addons/volto-conf2023-theme/package.json
+++ b/frontend/src/addons/volto-conf2023-theme/package.json
@@ -25,7 +25,7 @@
   ],
   "dependencies": {
     "@eeacms/volto-accordion-block": "7.1.0",
-    "@eeacms/volto-matomo": "3.0.1",
+    "@eeacms/volto-matomo": "4.1.3",
     "@kitconcept/volto-blocks-grid": "7.0.0",
     "@kitconcept/volto-separator-block": "3.0.1",
     "@kitconcept/volto-slider-block": "4.1.0",
diff --git a/version.txt b/version.txt
index 809bdcb..d40acaa 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.12
+1.15

From 154a8037a0857e7980c4aabc9cec6237b7b8ba6c Mon Sep 17 00:00:00 2001
From: Fred van Dijk <fredvd@gmail.com>
Date: Sun, 10 Sep 2023 12:18:57 +0200
Subject: [PATCH 3/6] Update Plone backend to 6.0.6, Volto frontend to 16.23.0
 Update docker compose stack versions to 3.8 Update workflow actions Fix OSI
 container image labels for frontednd and backend

---
 .github/workflows/backend-testing.yml   | 16 ++++++++--------
 .github/workflows/frontend-testing.yml  | 10 +++++-----
 CHANGES.rst                             | 10 ++++++++++
 backend/dockerfiles/Dockerfile          |  2 +-
 backend/version.txt                     |  2 +-
 devops/stacks/2023.ploneconf.org.yml    |  2 +-
 devops/stacks/testing.ploneconf.org.yml |  2 +-
 frontend/dockerfiles/Dockerfile         |  8 ++++----
 frontend/version.txt                    |  2 +-
 9 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/backend-testing.yml b/.github/workflows/backend-testing.yml
index d983c5d..302f382 100644
--- a/.github/workflows/backend-testing.yml
+++ b/.github/workflows/backend-testing.yml
@@ -23,7 +23,7 @@ jobs:
       PLONE_VERSION: ${{ steps.vars.outputs.PLONE_VERSION }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set Env Vars
         id: vars
@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Run check
         uses: plone/code-analysis-action@v2
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Run check
         uses: plone/code-analysis-action@v2
@@ -74,7 +74,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Run check
         uses: plone/code-analysis-action@v2
@@ -89,7 +89,7 @@ jobs:
       - meta
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Run tests
         run: |
@@ -104,7 +104,7 @@ jobs:
     steps:
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Docker meta
         id: meta
@@ -130,7 +130,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           platforms: linux/amd64
           context: backend
@@ -153,7 +153,7 @@ jobs:
       url: testing.ploneconf.org
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Deploy to cluster
         uses: kitconcept/docker-stack-deploy@v1.2.0
diff --git a/.github/workflows/frontend-testing.yml b/.github/workflows/frontend-testing.yml
index 2340b8b..ff37279 100644
--- a/.github/workflows/frontend-testing.yml
+++ b/.github/workflows/frontend-testing.yml
@@ -23,7 +23,7 @@ jobs:
       VOLTO_VERSION: ${{ steps.vars.outputs.VOLTO_VERSION }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set Env Vars
         id: vars
@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - name: Main checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Linting
         run: |
@@ -49,7 +49,7 @@ jobs:
 
     steps:
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Test
         run: |
@@ -90,7 +90,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           platforms: linux/amd64
           context: frontend/
@@ -113,7 +113,7 @@ jobs:
       url: testing.ploneconf.org
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Deploy to cluster
         uses: kitconcept/docker-stack-deploy@v1.2.0
diff --git a/CHANGES.rst b/CHANGES.rst
index 852c9dd..8f09079 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,13 @@
+2023-09-10 unreleased
+---------------------
+
+- Update Plone backend to 6.0.6, Volto frontend to 16.23.0
+- Update docker compose stack versions to 3.8
+- Update workflow actions
+- Fix OSI container image labels for frontednd and backend
+  [fredvd]
+
+
 2023-08-23 1.15
 --------------
 
diff --git a/backend/dockerfiles/Dockerfile b/backend/dockerfiles/Dockerfile
index b95f4dc..3ffdc28 100644
--- a/backend/dockerfiles/Dockerfile
+++ b/backend/dockerfiles/Dockerfile
@@ -21,7 +21,7 @@ EOT
 FROM plone/server-prod-config:${PLONE_VERSION}
 
 LABEL maintainer="Plone Foundation <conf@plone.org>" \
-      org.label-schema.name="ploneconf-backend" \
+      org.label-schema.name="ploneconf-2023-backend" \
       org.label-schema.description="Plone Conference 2023 backend." \
       org.label-schema.vendor="Plone Foundation"
 
diff --git a/backend/version.txt b/backend/version.txt
index 9b9a244..b7ff151 100644
--- a/backend/version.txt
+++ b/backend/version.txt
@@ -1 +1 @@
-6.0.2
+6.0.6
diff --git a/devops/stacks/2023.ploneconf.org.yml b/devops/stacks/2023.ploneconf.org.yml
index 8a76032..20f18d7 100644
--- a/devops/stacks/2023.ploneconf.org.yml
+++ b/devops/stacks/2023.ploneconf.org.yml
@@ -1,4 +1,4 @@
-version: "3.3"
+version: "3.8"
 
 services:
   frontend:
diff --git a/devops/stacks/testing.ploneconf.org.yml b/devops/stacks/testing.ploneconf.org.yml
index 95d40b6..fadf4df 100644
--- a/devops/stacks/testing.ploneconf.org.yml
+++ b/devops/stacks/testing.ploneconf.org.yml
@@ -1,4 +1,4 @@
-version: "3.3"
+version: "3.8"
 
 services:
   frontend:
diff --git a/frontend/dockerfiles/Dockerfile b/frontend/dockerfiles/Dockerfile
index c59aca4..2a741ca 100644
--- a/frontend/dockerfiles/Dockerfile
+++ b/frontend/dockerfiles/Dockerfile
@@ -17,9 +17,9 @@ EOT
 
 FROM plone/frontend-prod-config:${VOLTO_VERSION}
 
-LABEL maintainer="kitconcept GmbH <server@kitconcept.com>" \
-      org.label-schema.name="intra.kitconcept.com-frontend" \
-      org.label-schema.description="kitconcept Intranet frontend image." \
-      org.label-schema.vendor="kitconcept GmbH"
+LABEL maintainer="Plone Foundation <conf@plone.org>" \
+      org.label-schema.name="ploneconf-2023-frontend" \
+      org.label-schema.description="Plone Conference 2023 frontend." \
+      org.label-schema.vendor="Plone Foundation"
 
 COPY --from=builder /app/ /app/
diff --git a/frontend/version.txt b/frontend/version.txt
index aa18c61..4f7f502 100644
--- a/frontend/version.txt
+++ b/frontend/version.txt
@@ -1 +1 @@
-16.17.1
\ No newline at end of file
+16.23.0
\ No newline at end of file

From 1b27f2e3589094d6a802848064ae6f109f8e953a Mon Sep 17 00:00:00 2001
From: Fred van Dijk <fredvd@gmail.com>
Date: Wed, 13 Sep 2023 22:27:49 +0200
Subject: [PATCH 4/6] Fix ++api++/++api++/++api++ calls with Traefik filter
 rule

---
 CHANGES.rst                             | 3 +++
 devops/stacks/2023.ploneconf.org.yml    | 4 +++-
 devops/stacks/testing.ploneconf.org.yml | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 8f09079..8099da7 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,9 @@
 2023-09-10 unreleased
 ---------------------
 
+- Fix ++api++/++api++/++api++ calls with Traefik filter rule
+  [ericof, fredvd]
+
 - Update Plone backend to 6.0.6, Volto frontend to 16.23.0
 - Update docker compose stack versions to 3.8
 - Update workflow actions
diff --git a/devops/stacks/2023.ploneconf.org.yml b/devops/stacks/2023.ploneconf.org.yml
index 20f18d7..453fe2c 100644
--- a/devops/stacks/2023.ploneconf.org.yml
+++ b/devops/stacks/2023.ploneconf.org.yml
@@ -54,6 +54,8 @@ services:
         ### ClassicUI Access Authentication
         - traefik.http.middlewares.2023_ploneconf-backend-auth.basicauth.users=ploneconf:$$2y$$05$$SLsKIKgK.NlD.64HMV42hOUNi3pQM/T.iW4qziWs0xcKHzkaa8T8C
         ### Backend ++api++ VHM
+        - "traefik.http.middlewares.2023_ploneconf-vhm-cleanup.replacepathregex.regex=^/((\\+\\+api\\+\\+/){1,})($$|.*)"
+        - "traefik.http.middlewares.2023_ploneconf-vhm-cleanup.replacepathregex.replacement=/VirtualHostBase/https/2023.ploneconf.org/Plone/++api++/VirtualHostRoot/$$3"
         - "traefik.http.middlewares.2023_ploneconf-vhm.replacepathregex.regex=^/\\+\\+api\\+\\+($$|/.*)"
         - "traefik.http.middlewares.2023_ploneconf-vhm.replacepathregex.replacement=/VirtualHostBase/https/2023.ploneconf.org/Plone/++api++/VirtualHostRoot/$$1"
         ### Backend ClassicUI VHM
@@ -65,7 +67,7 @@ services:
         - traefik.http.routers.2023_ploneconf-backend.entrypoints=https
         - traefik.http.routers.2023_ploneconf-backend.tls=true
         - traefik.http.routers.2023_ploneconf-backend.service=2023_ploneconf-backend
-        - traefik.http.routers.2023_ploneconf-backend.middlewares=gzip,2023_ploneconf-vhm
+        - traefik.http.routers.2023_ploneconf-backend.middlewares=gzip,2023_ploneconf-vhm-cleanup,2023_ploneconf-vhm
         ### ploneconf.org /ClassicUI - protected with basic auth (prevent SEOs from crawl it)
         - traefik.http.routers.2023_ploneconf-classicui.rule=Host(`2023.ploneconf.org`) && (PathPrefix(`/ClassicUI`))
         - traefik.http.routers.2023_ploneconf-classicui.entrypoints=https
diff --git a/devops/stacks/testing.ploneconf.org.yml b/devops/stacks/testing.ploneconf.org.yml
index fadf4df..4796ff2 100644
--- a/devops/stacks/testing.ploneconf.org.yml
+++ b/devops/stacks/testing.ploneconf.org.yml
@@ -55,6 +55,8 @@ services:
         - traefik.http.middlewares.testing_ploneconf-backend-auth.basicauth.users=ploneconf:$$2y$$05$$SLsKIKgK.NlD.64HMV42hOUNi3pQM/T.iW4qziWs0xcKHzkaa8T8C
         - traefik.http.middlewares.testing_ploneconf-zope-auth.basicauth.users=zopeadmin:$$apr1$$7jQv8Qcp$$IzN7fnLaFrWJR7Ob5cljK/
         ### Backend ++api++ VHM
+        - "traefik.http.middlewares.testing_ploneconf-vhm-cleanup.replacepathregex.regex=^/((\\+\\+api\\+\\+/){1,})($$|.*)"
+        - "traefik.http.middlewares.testing_ploneconf-vhm-cleanup.replacepathregex.replacement=/VirtualHostBase/https/testing.ploneconf.org/Plone/++api++/VirtualHostRoot/$$3"
         - "traefik.http.middlewares.testing_ploneconf-vhm.replacepathregex.regex=^/\\+\\+api\\+\\+($$|/.*)"
         - "traefik.http.middlewares.testing_ploneconf-vhm.replacepathregex.replacement=/VirtualHostBase/https/testing.ploneconf.org/Plone/++api++/VirtualHostRoot/$$1"
         ### Backend ClassicUI VHM
@@ -69,7 +71,7 @@ services:
         - traefik.http.routers.testing_ploneconf-backend.entrypoints=https
         - traefik.http.routers.testing_ploneconf-backend.tls=true
         - traefik.http.routers.testing_ploneconf-backend.service=testing_ploneconf-backend
-        - traefik.http.routers.testing_ploneconf-backend.middlewares=gzip,testing_ploneconf-vhm
+        - traefik.http.routers.testing_ploneconf-backend.middlewares=gzip,testing_ploneconf-vhm-cleanup,testing_ploneconf-vhm
         ### ploneconf.org /ClassicUI - protected with basic auth (prevent SEOs from crawl it)
         - traefik.http.routers.testing_ploneconf-classicui.rule=Host(`testing.ploneconf.org`) && (PathPrefix(`/ClassicUI`))
         - traefik.http.routers.testing_ploneconf-classicui.entrypoints=https

From cc211ee1186eb46e058f820ceec00e95c6353293 Mon Sep 17 00:00:00 2001
From: Fred van Dijk <fredvd@gmail.com>
Date: Sun, 17 Sep 2023 17:38:16 +0200
Subject: [PATCH 5/6] update changes format to match zest.releaser support. Use
 .dev0 semver notation.

---
 CHANGES.rst | 162 +++++++++++-----------------------------------------
 version.txt |   2 +-
 2 files changed, 33 insertions(+), 131 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 8099da7..a8013f1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,5 +1,5 @@
-2023-09-10 unreleased
----------------------
+1.16.dev0 (unreleased)
+-----------------------
 
 - Fix ++api++/++api++/++api++ calls with Traefik filter rule
   [ericof, fredvd]
@@ -11,82 +11,82 @@
   [fredvd]
 
 
-2023-08-23 1.15
---------------
+1.15 (2023-08-23)
+-----------------
 
 - Bump volto-matomo
   [ericof]
 
-2023-06-19 1.14
---------------
+1.14 (2023-06-19)
+-----------------
 
 - Schedule block style
   [libargutxi]
 
-2023-06-16 1.13
---------------
+1.13 (2023-06-16)
+-----------------
 
 - Speakers, Talks and filters
 - Small style changes
   [libargutxi]
 
-2023-05-12 1.11
---------------
+1.12 (2023-05-12)
+-----------------
 
 - Sponsor and News Item view
 - Small style changes
   [libargutxi]
 
-2023-04-18 1.10
---------------
+1.10 2023-04-18)
+----------------
 
 - Styled sponsors
   [libargutxi]
 
-2023-04-05 1.9
---------------
+1.9 (2023-04-05)
+----------------
 
 - Styled H2 block
   [ionlizarazu]
 
-2023-04-04 1.8
---------------
+1.8 (2023-04-04)
+----------------
 
 - Picture source default url
   [libargutxi]
 
-2023-04-04 1.7
---------------
+1.7 (2023-04-04)
+----------------
 
 - Picture source and frontend styles
   [libargutxi]
 
-2023-03-30 1.6
---------------
+1.6 (2023-03-30)
+----------------
 
 - Enable volto-authomatic
   [fredvd]
 
-2023-03-30 1.5
---------------
+1.5 (2023-03-30)
+----------------
 
 - Sponsors grid styles
   [libargutxi]
 
-2023-03-30 1.4
---------------
+1.4 (2023-03-30)
+----------------
 
 - Install captcha products for volto-form-block
   [erral]
 
-2023-03-30 1.3
---------------
+1.3 (2023-03-30)
+----------------
 
 - Frontend styles
   [libargutxi]
 
-2023-03-29 1.2
---------------
+1.2 (2023-03-29)
+----------------
 
 - Frontend styles
   [ionlizarazu & libargutxi]
@@ -94,114 +94,16 @@
 - Install captcha
   [erral]
 
-2023-03-29 1.1
+1.1 (2023-03-29)
 ----------------
 
 - teaser variations
   [libargutxi & ionlizarazu]
 
-2023-03-29 1.0.0
-----------------
+1.0.0 (2023-03-29)
+------------------
 
 - 2023 site design
   [libargutxi & ionlizarazu]
 
-
-2022 site
----------
-
-- restore hard space in Nuclia block text
-  [tkimnguyen]
-
-- Change Nuclia block text to include 2022 videos, hide Register Now call to action
-  [tkimnguyen]
-
-- Fix Venue block description
-  [mpeeters]
-
-- Update to Plone 6 b3 and Volto 16a41
-  [sneridagh]
-
-- Add styling and title to nuclia Block
-  [jchandelle]
-
-- Update Volto, pin several packages, update browserlist.
-  [sneridagh]
-
-- Add Nuclia block
-  [jchandelle]
-
-- Change sponsor logo size
-  [jchandelle]
-
-- Improve design of Schedule block
-  [jchandelle]
-
-- Fix Schedule block
-  [jchandelle]
-
-- Fix start and end dates to include timezone in ical view
-  [mpeeters]
-
-- Adapt session serializer to handle timezone correctly
-  [mpeeters]
-
-- Fix Schedule Block default value and trad
-  [jchandelle]
-
-- Add Schedule Block
-  [jchandelle]
-
-- Fix relationList empty error if editing an object with "presenters" field.
-  [sneridagh]
-
-- Add spaces between block
-  [jchandelle]
-
-- Fix Venue and Hero Image theming
-  [jchandelle]
-
-- Fix talk view css
-  [jchandelle]
-
-- Fix responsive for person view and Change schedule view
-  [jchandelle]
-
-- Restore volto-authomatic
-  [jchandelle, mpeeters]
-
-- improve design, ui and ux
-  [jchandelle, mpeeters]
-
-- implement design and related blocks
-  [jchandelle, tlambert, duchenean]
-
-2022-05-21
-----------
-
-- add notes and userful docker commands
-  [tkimnguyen]
-
-- update sizes for logo of sponsors
-  [ericof]
-
-- update tito block to point to 2022
-  [ericof]
-
-- Upgrade Plone to version 6.0.0b1
-  [ericof]
-
-- Upgrade pas.plugins.authomatic to version 1.0.0
-  [ericof]
-
-- Use @plone-collective/volto-authomatic
-  [ericof]
-
-- Use @plone-collective/volto-tito-block
-  [ericof]
-
-- Upgrade @plone/volto to version 16.0.0-alpha.17
-  [ericof]
-
-- Upgrade @plone/volto to version 16.0.0-alpha.20
-  [ericof]
+- Older changes taken from 2022 PloneConf site in ploneconf.org repo
diff --git a/version.txt b/version.txt
index d40acaa..e4eb247 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.15
+1.16.dev0

From e2de92360d1bd3e70d91958dcad6833c192da90b Mon Sep 17 00:00:00 2001
From: Fred van Dijk <fredvd@gmail.com>
Date: Sun, 17 Sep 2023 17:39:22 +0200
Subject: [PATCH 6/6] Use volto 16.24.0

---
 CHANGES.rst          | 2 +-
 frontend/version.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index a8013f1..6df0a82 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,7 +4,7 @@
 - Fix ++api++/++api++/++api++ calls with Traefik filter rule
   [ericof, fredvd]
 
-- Update Plone backend to 6.0.6, Volto frontend to 16.23.0
+- Update Plone backend to 6.0.6, Volto frontend to 16.24.0
 - Update docker compose stack versions to 3.8
 - Update workflow actions
 - Fix OSI container image labels for frontednd and backend
diff --git a/frontend/version.txt b/frontend/version.txt
index 4f7f502..772010c 100644
--- a/frontend/version.txt
+++ b/frontend/version.txt
@@ -1 +1 @@
-16.23.0
\ No newline at end of file
+16.24.0
\ No newline at end of file