django-cms · fsbraun · Jan 26, 2024 · Sep 18, 2023 · Sep 19, 2023 · Sep 21, 2023
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -3,6 +3,3 @@ contact_links:
   - name: Question
     url: https://www.django-cms.org/en/support/
     about: Please use our community channels to ask for questions.
-  - name: Feature Request
-    url: https://discourse.django-cms.org/c/feature-requests
-    about: Please submit and discuss feature requests via discourse forum.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v3
         with:
-          python-version: "3.10"
+          python-version: "3.12"
           cache: 'pip'
       - name: Cache dependencies
         uses: actions/cache@v3

diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
@@ -24,3 +24,5 @@ jobs:
     - run: |
           gulp unitTest
           gulp lint
+    - run: gulp icons
+    - run: gulp sass
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.11"
+          python-version: "3.12"
           cache: 'pip'
       - run: |
           python -m pip install --upgrade pip

diff --git a/.github/workflows/publish-to-live-pypi.yml b/.github/workflows/publish-to-live-pypi.yml
@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.10
+    - name: Set up Python 3.12
       uses: actions/setup-python@v3
       with:
-        python-version: '3.10'
+        python-version: '3.12'
 
     - name: Install pypa/build
       run: >-

diff --git a/.github/workflows/publish-to-test-pypi.yml b/.github/workflows/publish-to-test-pypi.yml
@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.10
+    - name: Set up Python 3.12
       uses: actions/setup-python@v3
       with:
-        python-version: '3.10'
+        python-version: '3.12'
 
     - name: Install pypa/build
       run: >-

diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
@@ -0,0 +1,24 @@
+name: Comment on PRs into release/* branches
+
+on:
+  pull_request:
+    types: [opened, reopened]
+    branches:
+      - release/*
+
+jobs:
+  comment:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - name: Comment on PR
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            try { github.rest.issues.createComment({
+              issue_number: context.issues.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: '👋 Hi there!\n\nPlease remember to **MERGE COMMIT** pull requests from `develop` or `develop-4`!\n\n**Do not SQUASH** commits to preserve history for the changelog.'
+            }) } catch(e) { console.log(e) } 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,23 +7,27 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  database-postgres:
+  postgres:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ '3.8', '3.9', '3.10', '3.11']
+        python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12']
         requirements-file: [
-          django-2.2.txt,
-          django-3.1.txt,
           django-3.2.txt,
           django-4.0.txt,
           django-4.1.txt,
           django-4.2.txt,
+          django-5.0.txt
         ]
         os: [
           ubuntu-20.04,
         ]
+        exclude:
+          - requirements-file: django-5.0.txt
+            python-version: 3.8
+          - requirements-file: django-5.0.txt
+            python-version: 3.9
 
     services:
       postgres:
@@ -52,7 +56,6 @@ jobs:
         pip install pytest
         pip install -r test_requirements/${{ matrix.requirements-file }}
         pip install -r test_requirements/databases.txt
-        pip install -r docs/requirements.txt
         python setup.py install
 
     - name: Test with django test runner
@@ -62,23 +65,27 @@ jobs:
         DATABASE_URL: postgres://postgres:postgres@127.0.0.1/postgres
 
 
-  database-mysql:
+  mysql:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ '3.8', '3.9', '3.10', '3.11']
+        python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12']
         requirements-file: [
-          django-2.2.txt,
-          django-3.1.txt,
           django-3.2.txt,
           django-4.0.txt,
           django-4.1.txt,
           django-4.2.txt,
+          django-5.0.txt
         ]
         os: [
           ubuntu-20.04,
         ]
+        exclude:
+          - requirements-file: django-5.0.txt
+            python-version: 3.8
+          - requirements-file: django-5.0.txt
+            python-version: 3.9
 
     services:
       mysql:
@@ -107,7 +114,6 @@ jobs:
         pip install pytest
         pip install -r test_requirements/${{ matrix.requirements-file }}
         pip install -r test_requirements/databases.txt
-        pip install -r docs/requirements.txt
         python setup.py install
 
 
@@ -117,23 +123,27 @@ jobs:
       env:
         DATABASE_URL: mysql://root@127.0.0.1/djangocms_test
 
-  database-sqlite:
+  sqlite:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ '3.8', '3.9', '3.10', '3.11']
+        python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12']
         requirements-file: [
-          django-2.2.txt,
-          django-3.1.txt,
           django-3.2.txt,
           django-4.0.txt,
           django-4.1.txt,
           django-4.2.txt,
+          django-5.0.txt
         ]
         os: [
           ubuntu-20.04,
         ]
+        exclude:
+          - requirements-file: django-5.0.txt
+            python-version: 3.8
+          - requirements-file: django-5.0.txt
+            python-version: 3.9
 
     steps:
     - uses: actions/checkout@v3
@@ -149,7 +159,6 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest
         pip install -r test_requirements/${{ matrix.requirements-file }}
-        pip install -r docs/requirements.txt
         python setup.py install
 
     - name: Test with django test runner

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -2,6 +2,11 @@
 # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
 version: 2
 
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
 sphinx:
   configuration: docs/conf.py
   fail_on_warning: false
@@ -11,8 +16,5 @@ formats:
   - pdf
 
 python:
-  version: 3.8
-
   install:
     - requirements: docs/requirements.txt
-  system_packages: false
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,82 @@
 Changelog
 =========
 
+3.11.4 (2023-09-06)
+===================
+
+Features:
+---------
+* Update dark mode switch to be compatible with Django 4.2 admin dark mode (#7549) (1106ae6d7) -- Fabian Braun
+
+Bug Fixes:
+----------
+* Toolbar action button becomes hard to read in dark mode (c626022ba) -- Fabian Braun
+* Backport v4.1.0rc4 fixes - Admin language and styling (#7630) (#7641) (90b72ebea) -- Fabian Braun
+* diff-dom freezing on content refresh: #7460 (#7600) (d8e9c527e) -- Vinit Kumar
+* Fixed RecursionError when extending templates (#7594) (c99f78759) -- mihalikv
+* JS issues with running CMS under cypress (#7591) (ce4c29948) -- Vinit Kumar
+* Mitigate performance hit due to deprecation warnings for v4.1 (#7587) (9908d7e70) -- Fabian Braun
+* create page wizard fails with Asian page titles/unicode slugs (#7565) (0ab640ce3) -- Fabian Braun
+* require Django >= 3.2 (#7562) (a77358b93) -- Fabian Braun
+* respect pre-set (48353c2d6) -- Fabian Braun
+* lint menus app (#7534) (927b60b47) -- Vinit Kumar
+* remove curly bracket left behind on PR 7488 (#7529) (123f7df91) -- Corentin Bettiol
+
+Statistics:
+-----------
+
+This release includes 46 pull requests, and was created with the help of the following contributors (in alphabetical order):
+
+* ChengDaqi2023 (1 pull request)
+* Corentin Bettiol (1 pull request)
+* Fabian Braun (15 pull requests)
+* Github Release Action (3 pull requests)
+* Vinit Kumar (3 pull requests)
+* caption (1 pull request)
+* mihalikv (1 pull request)
+* suryadev99 (1 pull request)
+
+With the review help of the following contributors:
+
+* Cage Johnson
+* Christian Clauss
+* Conrad
+* Corentin Bettiol
+* Danny Waser
+* Dapo Adedire
+* Fabian Braun
+* Fabien MICHEL
+* Florian Delizy
+* G3RB3N
+* Github Release Action
+* Hussein Srour
+* Ivo Branco
+* Jasper
+* Marco Bonetti
+* Mark Walker
+* Micah Denbraver
+* Nihal
+* Nihal Rahman
+* Pankrat
+* Patrick Mazulo
+* Petr Klus
+* Qijia Liu
+* Shivan Sivakumaran
+* Simon Krull
+* Vinit Kumar
+* code-review-doctor
+* dependabot[bot]
+* fsbraun
+* jefe
+* jillalberts
+* pajowu
+* ton77v
+* viliam mihalik
+* viliammihalik
+* wesleysima
+
+Thanks to all contributors for their efforts!
+
 3.11.3 (2023-04-25)
 ===================
 

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -76,7 +76,6 @@ Community & Association
 You can join us online:
 
 * in our `django CMS Slack channel <https://www.django-cms.org/slack>`_
-* on our `Discourse forum <https://discourse.django-cms.org>`_
 
 You can join a work group and work collaboratively on django CMS
 

diff --git a/README.rst b/README.rst
@@ -100,7 +100,7 @@ The demo platform is kindly provided by Divio, platinum member of the django CMS
 Getting Help
 ************
 
-Please head over to our `Slack channel <https://www.django-cms.org/slack>`_ or our `discourse forum <https://discourse.django-cms.org/>`_ for support.
+Please head over to our `Slack channel <https://www.django-cms.org/slack>`_ for support.
 
 ********************
 Professional support

diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+As ever, we remind our users and contributors that all security reports, patches and concerns be addressed only to our security team by email, at security@django-cms.org.
diff --git a/cms/__init__.py b/cms/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '3.11.3'
+__version__ = '3.11.4'
 
 try:
     import django

diff --git a/cms/admin/pageadmin.py b/cms/admin/pageadmin.py
@@ -1233,8 +1233,10 @@ def unpublish(self, request, page_id, language):
         return HttpResponseRedirect(path)
 
     def delete_translation(self, request, object_id, extra_context=None):
-        if 'language' in request.GET:
-            language = request.GET['language']
+        if 'delete_language' in request.GET:
+            language = request.GET['delete_language']
+        elif 'delete_language' in request.POST:
+            language = request.POST['delete_language']
         else:
             language = get_language_from_request(request)
 

diff --git a/cms/cache/placeholder.py b/cms/cache/placeholder.py
@@ -43,7 +43,13 @@ def _get_placeholder_cache_version_key(placeholder, lang, site_id):
         lang=str(lang),
         site=site_id,
     )
-    if len(key) > 250:
+    # django itself adds "version" add the end of cache-keys, e.g. "<key>:1".
+    # -> If `cache.set()` is for example called with `version=""`, it still adds
+    #    `:` at the end. So if we check the length for `> 250`, a length of 249
+    #    or even 250 ends up in an InvalidCacheKey-exception.
+    # In order to avoid these errors, we hash the keys at a lower length to also
+    # have a little buffer.
+    if len(key) > 200:
         key = '{prefix}|{hash}'.format(
             prefix=prefix,
             hash=hashlib.sha1(key.encode('utf-8')).hexdigest(),