Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: plone/plone.org
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.12
Choose a base ref
...
head repository: plone/plone.org
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
10 contributors
Loading
Showing with 1,234 additions and 171 deletions.
  1. +12 −12 .github/workflows/backend-testing.yaml
  2. +9 −9 .github/workflows/code-analysis.yml
  3. +12 −12 .github/workflows/deploy-tag-release-live.yml
  4. +12 −12 .github/workflows/frontend-testing.yml
  5. +48 −0 .github/workflows/redeploy-live.yaml
  6. +1 −1 .github/workflows/redeploy-testing.yaml
  7. +81 −5 CHANGELOG.md
  8. +18 −0 README.md
  9. +1 −1 backend/.gitignore
  10. +2 −2 backend/Dockerfile
  11. +23 −0 backend/Dockerfile.maintenance
  12. +10 −4 backend/Makefile
  13. +1 −0 backend/constraints.txt
  14. +13 −0 backend/instance-local.yaml.example
  15. +4 −6 backend/instance.yaml
  16. +2 −0 backend/mx.ini
  17. +8 −0 backend/requirements-bootstrap.txt
  18. +6 −0 backend/requirements-docker.txt
  19. +5 −2 backend/requirements.txt
  20. +61 −0 backend/scripts/catalog_clear_rebuild.py
  21. +95 −0 backend/scripts/purge_image_scales.py
  22. +1 −0 backend/src/ploneorg/setup.py
  23. +0 −1 backend/src/ploneorg/src/ploneorg/content/foundationsponsor.py
  24. +7 −0 backend/src/ploneorg/src/ploneorg/profiles/default/catalog.xml
  25. +1 −1 backend/version.txt
  26. +4 −4 devops/stacks/plone.org.yml
  27. +22 −0 devops/zodbconvert/README.txt
  28. +15 −0 devops/zodbconvert/docker-compose.yml
  29. +1 −0 devops/zodbconvert/export_filestorage.sh
  30. +11 −0 devops/zodbconvert/export_filestorage_tarball.sh
  31. +11 −0 devops/zodbconvert/from-relstorage.cfg
  32. +2 −0 devops/zodbconvert/requirements.txt
  33. +2 −0 devops/zodbconvert/restore_dump_to_postgresql.sh
  34. +11 −0 devops/zodbconvert/to-relstorage.cfg
  35. +3 −14 docker-compose.override.yml.orig
  36. +4 −8 docker-compose.yml
  37. +5 −0 frontend/locales/de/LC_MESSAGES/volto.po
  38. +5 −0 frontend/locales/en/LC_MESSAGES/volto.po
  39. +5 −0 frontend/locales/es/LC_MESSAGES/volto.po
  40. +5 −0 frontend/locales/eu/LC_MESSAGES/volto.po
  41. +5 −0 frontend/locales/fr/LC_MESSAGES/volto.po
  42. +5 −0 frontend/locales/it/LC_MESSAGES/volto.po
  43. +5 −0 frontend/locales/ja/LC_MESSAGES/volto.po
  44. +5 −0 frontend/locales/nl/LC_MESSAGES/volto.po
  45. +5 −0 frontend/locales/pt/LC_MESSAGES/volto.po
  46. +5 −0 frontend/locales/pt_BR/LC_MESSAGES/volto.po
  47. +5 −0 frontend/locales/ro/LC_MESSAGES/volto.po
  48. +6 −1 frontend/locales/volto.pot
  49. +12 −6 frontend/package.json
  50. +16 −0 frontend/src/components/Blocks/IconsAndText/Sidebar.jsx
  51. +1 −0 frontend/src/components/Blocks/IconsAndText/View.jsx
  52. +6 −1 frontend/src/components/Blocks/Listing/variations/SponsorCardListing.jsx
  53. +9 −1 frontend/src/customizations/volto/components/theme/Footer/Footer.jsx
  54. +56 −16 frontend/src/customizations/volto/helpers/FormValidation/FormValidation.js
  55. +364 −0 frontend/src/customizations/volto/helpers/Url/Url.js
  56. +12 −0 frontend/theme/extras/site/components/blocks/icons_and_text.less
  57. +22 −1 frontend/theme/globals/site.overrides
  58. +1 −1 frontend/version.txt
  59. +154 −49 frontend/yarn.lock
  60. +1 −1 version.txt
24 changes: 12 additions & 12 deletions .github/workflows/backend-testing.yaml
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,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
@@ -26,7 +26,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
@@ -39,7 +39,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
@@ -52,7 +52,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
@@ -69,14 +69,14 @@ jobs:
python:
- 3.11
plone:
- "6.0.6"
- "6.0.9"

defaults:
run:
working-directory: ./backend

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Plone ${{ matrix.plone }} with Python ${{ matrix.python }}
uses: plone/setup-plone@v2.0.0
@@ -102,11 +102,11 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: |
ghcr.io/plone/ploneorg-backend
@@ -118,17 +118,17 @@ jobs:
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
platforms: linux/amd64
context: backend
@@ -148,7 +148,7 @@ jobs:
url: https://testing.plone.org
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Deploy to testing.plone.org
uses: kitconcept/docker-stack-deploy@v1.2.0
18 changes: 9 additions & 9 deletions .github/workflows/code-analysis.yml
View file
Original file line number Diff line number Diff line change
@@ -15,10 +15,10 @@ jobs:
working-directory: ./frontend
steps:
- name: Checkout codebase
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Use Node.js ${{ env.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ env.node-version }}
cache: 'yarn'
@@ -37,7 +37,7 @@ jobs:
working-directory: ./frontend
steps:
- name: Checkout codebase
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Run Prettier
run: npx prettier@2.0.5 --single-quote --check 'src/**/*.{js,jsx,ts,tsx,css,scss}' --config=package.json
@@ -51,10 +51,10 @@ jobs:

steps:
- name: Checkout codebase
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Use Node.js ${{ env.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ env.node-version }}
cache: 'yarn'
@@ -70,7 +70,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
@@ -82,7 +82,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
@@ -94,7 +94,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
@@ -106,7 +106,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
24 changes: 12 additions & 12 deletions .github/workflows/deploy-tag-release-live.yml
View file
Original file line number Diff line number Diff line change
@@ -19,23 +19,23 @@ jobs:
TAG: ${{ steps.vars.outputs.TAG }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set Env Vars
id: vars
run: |
echo "TAG=sha-$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
echo "TAG=${{ github.ref_name }}" >> $GITHUB_OUTPUT
release-frontend:
runs-on: ubuntu-latest
needs:
- meta
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: |
${{ env.IMAGE_NAME_PREFIX }}-${{ env.FRONTEND_IMAGE_NAME_SUFFIX }}
@@ -46,15 +46,15 @@ jobs:
type=pep440,pattern={{version}}
type=sha
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
platforms: linux/amd64
context: frontend
@@ -69,7 +69,7 @@ jobs:
- meta
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Docker meta
id: meta
uses: docker/metadata-action@v4
@@ -84,17 +84,17 @@ jobs:
type=sha
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
platforms: linux/amd64
context: backend
@@ -114,7 +114,7 @@ jobs:
url: https://plone.org
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Deploy to cluster
uses: kitconcept/docker-stack-deploy@v1.2.0
24 changes: 12 additions & 12 deletions .github/workflows/frontend-testing.yml
View file
Original file line number Diff line number Diff line change
@@ -20,10 +20,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout codebase
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Use Node.js ${{ env.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ env.node-version }}
cache: 'yarn'
@@ -40,7 +40,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout codebase
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Run Prettier
run: npx prettier@2.0.5 --single-quote --check 'src/**/*.{js,jsx,ts,tsx,css,scss}' --config=package.json
@@ -51,10 +51,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout codebase
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Use Node.js ${{ env.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ env.node-version }}
cache: 'yarn'
@@ -71,10 +71,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout codebase
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Use Node.js ${{ env.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ env.node-version }}
cache: 'yarn'
@@ -94,7 +94,7 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Docker meta
id: meta
@@ -110,17 +110,17 @@ jobs:
type=raw,value=latest,enable={{is_default_branch}}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
platforms: linux/amd64
context: frontend/
@@ -141,7 +141,7 @@ jobs:
url: https://testing.plone.org
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Deploy to testing.plone.org
uses: kitconcept/docker-stack-deploy@v1.2.0
48 changes: 48 additions & 0 deletions .github/workflows/redeploy-live.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Redeploy version.txt tag to plone.org

on:
workflow_dispatch:

jobs:

meta:
runs-on: ubuntu-latest
outputs:
TAG: ${{ steps.vars.outputs.TAG }}
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set Env Vars
id: vars
run: |
echo "TAG=$(cat version.txt)" >> $GITHUB_OUTPUT
deploy:
if: github.event_name == 'workflow_dispatch'
concurrency: deploy
runs-on: ubuntu-latest
needs:
- meta
environment:
name: plone.org
url: https://plone.org
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Deploy to cluster
uses: kitconcept/docker-stack-deploy@v1.2.0
with:
registry: "ghcr.io"
username: ${{ github.actor }}
password: ${{ secrets.DEPLOY_GHCR_READ_TOKEN }}
remote_host: ${{ vars.DEPLOY_HOST }}
remote_port: ${{ vars.DEPLOY_PORT }}
remote_user: ${{ vars.DEPLOY_USER }}
remote_private_key: ${{ secrets.DEPLOY_SSH }}
stack_file: devops/stacks/plone.org.yml
stack_name: plone-org
stack_param: ${{ needs.meta.outputs.TAG }}
env_file: ${{ secrets.ENV_FILE }}
deploy_timeout: 480
2 changes: 1 addition & 1 deletion .github/workflows/redeploy-testing.yaml
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ jobs:
url: https://testing.plone.org
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Deploy 'latest' image tags to testing.plone.org
uses: kitconcept/docker-stack-deploy@v1.2.0
Loading