django-cms · fsbraun · Nov 13, 2024 · Nov 12, 2024 · Nov 12, 2024 · Nov 12, 2024
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.9, '3.10', '3.11', '3.12', '3.13.0-rc.2']  # latest release minus two
+        python-version: ['3.9', '3.10', '3.11', '3.12']
         requirements-file: [
           django-2.2.txt,
           django-3.2.txt,
@@ -76,7 +76,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.9, '3.10', '3.11', '3.12', '3.13.0-rc.2']  # latest release minus two
+        python-version: ['3.9', '3.10', '3.11', '3.12']
         requirements-file: [
           django-2.2.txt,
           django-3.2.txt,
@@ -139,7 +139,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.9, '3.10', '3.11', '3.12', '3.13.0-rc.2']  # latest release minus two
+        python-version: ['3.9', '3.10', '3.11', '3.12']
         requirements-file: [
           django-2.2.txt,
           django-3.2.txt,

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,39 @@
+4.1.4 (2024-11-12)
+==================
+
+Bug Fixes:
+----------
+* XSS vulnerability for page title (#8075) (c045a990e) -- Fabian Braun
+* Menus crashed when unexpected page content was present (#8052) -- Fabian Braun
+* Sites menu was empty in the page tree (#8064) -- Fabian Braun
+* Added redirect message when in editing a redirect toolbar object (#8056) -- Sal
+* X frame options added to page settings form (#8041) -- Sal
+* template tag ``get_admin_url_for_language`` did not return the latest page content (#7967) -- Fabian Braun
+* Sitemap return a QuerySet in CMSSitemap.items() (#8031) -- Jens-Erik Weber
+* Improved UX when page content is missing in selected language (#8033) -- Jacob Rief
+
+Other:
+------
+* Updated welcome page (#8057) -- Fabian Braun
+
+Statistics:
+-----------
+
+This release includes 9 pull requests, and was created with the help of the following contributors (in alphabetical order):
+
+* Fabian Braun (5 pull request)
+* Jacob Rief (1 pull request)
+* Jens-Erik Weber (1 pull request)
+* Sal (2 pull request)
+
+With the review help of the following contributors:
+
+* Jacob Rief
+* Mark Walker
+* Vinit Kumar
+
+Thanks to all contributors for their efforts!
+
 4.1.3 (2024-09-11)
 ==================
 

diff --git a/cms/__init__.py b/cms/__init__.py
@@ -1,3 +1,3 @@
-__version__ = '4.1.3'
+__version__ = '4.1.4'
 
 default_app_config = 'cms.apps.CMSConfig'
diff --git a/cms/locale/de/LC_MESSAGES/django.mo b/cms/locale/de/LC_MESSAGES/django.mo
diff --git a/cms/locale/de/LC_MESSAGES/django.po b/cms/locale/de/LC_MESSAGES/django.po
@@ -718,7 +718,7 @@ msgid "page content"
 msgstr "Seiteninhalt"
 
 msgid "page contents"
-msgstr "Seiteinhalte"
+msgstr "Seiteninhalte"
 
 msgid "default"
 msgstr "Standard"

diff --git a/cms/locale/en/LC_MESSAGES/django.mo b/cms/locale/en/LC_MESSAGES/django.mo
diff --git a/cms/locale/en/LC_MESSAGES/django.po b/cms/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django-cms\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-09-22 11:36+0000\n"
+"POT-Creation-Date: 2024-11-12 08:02+0000\n"
 "PO-Revision-Date: 2015-11-11 17:31+0000\n"
 "Last-Translator: yakky <i.spalletti@nephila.it>\n"
 "Language-Team: English (http://www.transifex.com/divio/django-cms/language/"
@@ -52,12 +52,23 @@ msgstr "menu visibility"
 msgid "limit when this page is visible in the menu"
 msgstr "limit when this page is visible in the menu"
 
+#, fuzzy
+#| msgid "Options"
+msgid "X Frame Options"
+msgstr "Options"
+
+msgid "Whether this page can be embedded in other pages or websites."
+msgstr ""
+
 msgid "URL options"
 msgstr "URL options"
 
 msgid "Menu options"
 msgstr "Menu options"
 
+msgid "Headers"
+msgstr ""
+
 msgid "Application"
 msgstr "Application"
 
@@ -1314,52 +1325,88 @@ msgstr "Maximize"
 msgid "Drop a plugin here"
 msgstr "Drop a plugin here"
 
-msgid "Installation successful!"
-msgstr "Installation successful!"
+#, fuzzy
+#| msgid "Welcome to django CMS"
+msgid "Welcome to your new django CMS installation!"
+msgstr "Welcome to django CMS"
 
-msgid "Add your first page"
-msgstr "Add your first page"
+#, python-format
+msgid "Version %(cms_version)s"
+msgstr ""
+
+msgid "Let’s build something great together!"
+msgstr ""
 
 msgid "Please log in"
 msgstr "Please log in"
 
-#, python-format
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "                        <a href=\"%(admin_add_page)s\" class=\"js-welcome-"
+#| "add\">Add the first page</a> to the system to continue.\n"
+#| "                    "
 msgid ""
 "\n"
-"                    Welcome to django CMS version <strong>%(cms_version)s</"
-"strong>.\n"
-"                "
+"                <a class=\"js-welcome-add cms-btn cms-btn-action\">Add your "
+"first page</a>\n"
+"            "
 msgstr ""
 "\n"
-"                    Welcome to django CMS version <strong>%(cms_version)s</"
-"strong>.\n"
-"                "
-
-#, python-format
-msgid ""
-"\n"
 "                        <a href=\"%(admin_add_page)s\" class=\"js-welcome-"
 "add\">Add the first page</a> to the system to continue.\n"
 "                    "
-msgstr ""
+
+msgid ""
 "\n"
-"                        <a href=\"%(admin_add_page)s\" class=\"js-welcome-"
-"add\">Add the first page</a> to the system to continue.\n"
-"                    "
+"                    <h2>Help Funding</h2>\n"
+"                    <p>\n"
+"                        Your funding directly benefits the product, mainly "
+"through the\n"
+"                        <a href=\"https://www.django-cms.org/en/fellowship-"
+"program/)!\">django CMS Fellowship Program</a>!\n"
+"                    </p>\n"
+"                    <p>\n"
+"                        A quick way for yourself or your organisation to "
+"donate is on\n"
+"                        <a href=\"https://github.com/sponsors/django-"
+"cms\">Github Sponsors</a>.\n"
+"                    </p>\n"
+"                "
+msgstr ""
 
-#, python-format
 msgid ""
 "\n"
-"                        JavaScript seems to be disabled so please\n"
-"                        <a href=\"%(admin_add_page)s\" class=\"js-welcome-"
-"add\">add a page</a> manually.\n"
-"                    "
+"                    <h2>Join Us</h2>\n"
+"                    <p>\n"
+"                        The django CMS Association is a non-profit "
+"organisation that funds and steers the development of\n"
+"                        django CMS.\n"
+"                    </p>\n"
+"                    <p>\n"
+"                        You can <a href=\"https://www.django-cms.org/en/"
+"memberships/\">join both as an individual or as an\n"
+"                        organisation</a>.\n"
+"                    </p>\n"
+"                "
 msgstr ""
+
+msgid ""
 "\n"
-"                        JavaScript seems to be disabled so please\n"
-"                        <a href=\"%(admin_add_page)s\" class=\"js-welcome-"
-"add\">add a page</a> manually.\n"
-"                    "
+"                    <h2>Contribute</h2>\n"
+"                    <ul>\n"
+"                        <li><a href=\"https://www.django-cms.org/en/"
+"contribute/\">Contribute code:</a> fix a bug or\n"
+"                            implement a new feature!</li>\n"
+"                        <li><a href=\"https://www.django-cms.org/en/"
+"volunteering-opportunities/\">Volunteer:</a>\n"
+"                            We offer fun and efficient team work!</li>\n"
+"                        <li><a href=\"https://www.django-cms.org/en/"
+"repositories-plugins/\">Open-source your work:</a>\n"
+"                            Make the ecosystem strong.</li>\n"
+"                    </ul>\n"
+"                "
+msgstr ""
 
 msgid "Installation Notes"
 msgstr "Installation Notes"
@@ -1370,6 +1417,14 @@ msgstr "Support"
 msgid "Documentation"
 msgstr "Documentation"
 
+#, fuzzy
+#| msgid "User (page)"
+msgid "User guide"
+msgstr "User (page)"
+
+msgid "Give back"
+msgstr ""
+
 msgid ""
 "\n"
 "                <p class=\"cms-welcome-notes\">If you don't see the django "
@@ -1631,6 +1686,38 @@ msgstr "Create a new %s instance."
 msgid "A wizard has already been registered for model: %s"
 msgstr "A wizard has already been registered for model: %s"
 
+#~ msgid "Installation successful!"
+#~ msgstr "Installation successful!"
+
+#~ msgid "Add your first page"
+#~ msgstr "Add your first page"
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ "                    Welcome to django CMS version "
+#~ "<strong>%(cms_version)s</strong>.\n"
+#~ "                "
+#~ msgstr ""
+#~ "\n"
+#~ "                    Welcome to django CMS version "
+#~ "<strong>%(cms_version)s</strong>.\n"
+#~ "                "
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ "                        JavaScript seems to be disabled so please\n"
+#~ "                        <a href=\"%(admin_add_page)s\" class=\"js-welcome-"
+#~ "add\">add a page</a> manually.\n"
+#~ "                    "
+#~ msgstr ""
+#~ "\n"
+#~ "                        JavaScript seems to be disabled so please\n"
+#~ "                        <a href=\"%(admin_add_page)s\" class=\"js-welcome-"
+#~ "add\">add a page</a> manually.\n"
+#~ "                    "
+
 #~ msgid "Title"
 #~ msgstr "Title"
 

diff --git a/cms/static/cms/css/4.1.3/cms.welcome.css b/cms/static/cms/css/4.1.3/cms.welcome.css