Merge branch 'develop' of github.com:fsbraun/django-cms into fsbraun-develop

# Conflicts:
#	CHANGELOG.rst
#	cms/static/cms/js/dist/3.11.1/bundle.admin.base.min.js
#	cms/static/cms/js/dist/3.11.1/bundle.admin.pagetree.min.js
#	package-lock.json

Author: fsbraun

.github/workflows/codeql.yml

@@ -0,0 +1,42 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "develop", "develop-4", "release/0.10.x", "release/2.1.x", "release/2.2.x", "release/2.3.x", "release/2.4.x", "release/3.0.x", "release/3.1.x", "release/3.2.x", "release/3.3.x", "release/3.4.x", "release/3.5.x", "release/3.6.x", "release/3.7.x", "release/3.8.x", "release/3.9.x", "release/3.10.x", "release/3.11.x", "release/4.0.x", "release/4.0.0.x", "release/4.0.1.x", "release/4.1.x" ]
+  pull_request:
+    branches: [ "develop" ]
+  schedule:
+    - cron: "40 4 * * 6"
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ python, javascript ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          queries: +security-and-quality
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+        if: ${{ matrix.language == 'python' || matrix.language == 'javascript' }}
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:${{ matrix.language }}"

.github/workflows/make-release.yml

@@ -0,0 +1,27 @@
+name: Create a django CMS release
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version number to create, e.g., "3.11.1rc1"'
+        required: true
+        type: string
+    branches:
+      - 'develop*'
+      - 'release/**'
+
+jobs:
+  make-release:
+    if: github.actor == 'marksweb' || github.actor == 'fsbraun'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out
+        uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v3
+      - name: Start building version ${{ inputs.version }}
+        env:
+          BUILD_BRANCH: release/build
+          TX_TOKEN: ${{ secrets.TX_TOKEN }}
+        run: ./scripts/make-release ${{ inputs.version }} ${GITHUB_REF}

.tx/config

@@ -1,12 +1,13 @@
 [main]
 host = https://www.transifex.com
 
-[django-cms.js]
+[o:divio:p:django-cms:r:core]
+file_filter = cms/locale/<lang>/LC_MESSAGES/django.po
+source_file = cms/locale/en/LC_MESSAGES/django.po
+source_lang = en
+
+[o:divio:p:django-cms:r:js]
 file_filter = cms/locale/<lang>/LC_MESSAGES/djangojs.po
 source_file = cms/locale/en/LC_MESSAGES/djangojs.po
 source_lang = en
 
-[django-cms.core]
-file_filter = cms/locale/<lang>/LC_MESSAGES/django.po
-source_file = cms/locale/en/LC_MESSAGES/django.po
-source_lang = en

cms/locale/nl/LC_MESSAGES/django.po

@@ -416,10 +416,10 @@ msgid "User guide"
 msgstr "Gebruikershandleiding"
 
 msgid "Support Forum"
-msgstr ""
+msgstr "Helpforum"
 
 msgid "Support Slack"
-msgstr ""
+msgstr "Help bij Slack"
 
 msgid "What's new"
 msgstr "Wat is nieuw"
@@ -1588,7 +1588,7 @@ msgid "Add plugin to %(plugin_name)s"
 msgstr "Voeg plugin toe aan %(plugin_name)s"
 
 msgid "Community forum"
-msgstr ""
+msgstr "Gemeenschapsforum"
 
 msgid "Getting started"
 msgstr "Aan de slag"
@@ -1614,7 +1614,7 @@ msgstr "Deze placeholder bevat al het maximale aantal (%(limit)s) van toegestane
 
 #, python-format
 msgid "This placeholder already has the maximum number of child plugins (%s)."
-msgstr ""
+msgstr "Deze placeholder bevat al het maximale aantal (%s) van toegestane plugins."
 
 #, python-brace-format
 msgid "Unable to find the specified CMS_REQUEST_IP_RESOLVER module: \"{0}\"."

cms/models/pluginmodel.py

@@ -1,3 +1,4 @@
+import inspect
 import json
 import os
 import warnings
@@ -310,6 +311,11 @@ def copy_plugin(self, target_placeholder, target_language, parent_cache, no_sign
         then overwriting its ID at step 5, the ORM will copy the custom
         fields for us.
         """
+
+        warnings.warn(f"{inspect.stack()[0][3]} is deprecated and will be removed in django CMS 4.1. "
+                      f"From version 4 on, please use cms.utils.copy_plugins_to_placeholder instead.",
+                      DeprecationWarning, stacklevel=2)
+
         try:
             plugin_instance, cls = self.get_plugin_instance()
         except KeyError:  # plugin type not found anymore

cms/static/cms/fonts/3.10.1/django-cms-iconfont.woff2

@@ -362,7 +362,7 @@
     margin: 0;
     padding: $messages-padding;
     border-radius: 0 0 $messages-border-radius $messages-border-radius;
-    background: rgba($messages-bgcolor, 0.74);
+    background: $messages-bgcolor;
     transition: top $speed-base;
     * {
         color: $messages-color;
@@ -578,7 +578,6 @@
     width: 100%;
     height: 100%;
     background-color: $screenblock-bgcolor;
-    background: rgba($screenblock-bgcolor, 0.9);
 }
 
 .cms-screenblock-inner {

cms/static/cms/js/dist/3.11.1/bundle.admin.base.min.js

@@ -1,6 +1,10 @@
+import inspect
+import warnings
 
 
 def use_draft(request):
+    warnings.warn(f"{inspect.stack()[0][3]} is deprecated and will be removed in django CMS 4.1",
+                  DeprecationWarning, stacklevel=2)
     is_staff = (request.user.is_authenticated and request.user.is_staff)
     return is_staff and not request.session.get('cms_preview')
 
@@ -9,6 +13,8 @@ def get_model_queryset(model, request=None):
     """Decision function used in frontend - says which model should be used.
     Public models are used unless looking at preview or edit versions of the page.
     """
+    warnings.warn(f"{inspect.stack()[0][3]} is deprecated and will be removed in django CMS 4.1",
+                  DeprecationWarning, stacklevel=2)
     if request and use_draft(request):
         return model.objects.drafts()
     return model.objects.public()
@@ -17,10 +23,14 @@ def get_model_queryset(model, request=None):
 def get_title_queryset(request=None):
     from cms.models import Title
 
+    warnings.warn(f"{inspect.stack()[0][3]} is deprecated and will be removed in django CMS 4.1",
+                  DeprecationWarning, stacklevel=2)
     return Title.objects.all()
 
 
 def get_cmsplugin_queryset(request=None):
     from cms.models import CMSPlugin
 
+    warnings.warn(f"{inspect.stack()[0][3]} is deprecated and will be removed in django CMS 4.1",
+                  DeprecationWarning, stacklevel=2)
     return CMSPlugin.objects.all()