Skip to content

Commit

Permalink
Merge 2492d72 into c6c2784
Browse files Browse the repository at this point in the history
  • Loading branch information
goutnet committed Jan 23, 2022
2 parents c6c2784 + 2492d72 commit 8c8bb77
Show file tree
Hide file tree
Showing 60 changed files with 1,238 additions and 298 deletions.
51 changes: 49 additions & 2 deletions CHANGELOG.rst
Expand Up @@ -3,8 +3,55 @@ Changelog
=========


unreleased
==========
3.10.0-RC1 (2022-01-23)
=======================

Bug Fixes:
----------
* Cap django requirement at <4 (#7182) (c6c278497) -- Mark Walker
* Set the default_auto_field on the AppConfigs (#7181) (272d62ced) -- Jeffrey de Lange
* do not convert & URL query separator to &amp; (#7114) (c0c10e051) -- nichoski
* discrepancy around python 3.6 compatibility between `setup.py`, docs and tests (#7095) (70970061f) -- Mark Walker
* update permission cache when moving pages and adding pages. (#7090) (53dddb106) -- Ryo Shimada
* https://github.com/django-cms/django-cms/projects/6#card-63761457 (#7085) (a5159d3a6) -- Gabriel Andrade
* missing tests of django3.2 for mysql and sqlite (#7082) (c7fd7c0c5) -- Vinit Kumar
* Fixes #7033: also check for Django 3.2, now that 3.9 supports it. (#7054) (#7062) (f4043cd75) -- Vinit Kumar

Statistics:
-----------

This release includes 48 pull requests, and was created with the help of the following contributors (in alphabetical order):

* Anatoliy (3 pull requests)
* Angelo Dini (1 pull request)
* Dmytro Litvinov (1 pull request)
* Florian Delizy (6 pull requests)
* Gabriel Andrade (1 pull request)
* Halit Çelik (1 pull request)
* Jean-Baptiste PENRATH (1 pull request)
* Jeffrey de Lange (1 pull request)
* Jens-Erik Weber (1 pull request)
* Kaushal Dhungel (1 pull request)
* Marco Bonetti (2 pull requests)
* Mark Walker (6 pull requests)
* Nebojsa Knezevic (2 pull requests)
* nichoski (2 pull requests)
* Nicolai (11 pull requests)
* Ryo Shimada (1 pull request)
* Simon Krull (4 pull requests)
* Stefan van den Eertwegh (1 pull request)
* Vinit Kumar (2 pull requests)

With the review help of the following contributors:

* Gabriel Andrade
* Marco Bonetti
* Nicolai
* TiredFingers
* victor-yunenko
* Vinit Kumar

Thanks to all contributors for their efforts!

3.9.0 (2021-06-30)
==================
Expand Down
2 changes: 1 addition & 1 deletion cms/__init__.py
@@ -1,6 +1,6 @@
import django

__version__ = '3.9.0'
__version__ = '3.10.0rc1'

if django.VERSION < (3, 2):
default_app_config = 'cms.apps.CMSConfig'
40 changes: 35 additions & 5 deletions cms/locale/ar/LC_MESSAGES/django.po
Expand Up @@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-19 21:14+0800\n"
"PO-Revision-Date: 2021-05-19 13:14+0000\n"
"POT-Creation-Date: 2022-01-23 22:31+0800\n"
"PO-Revision-Date: 2021-10-18 15:36+0000\n"
"Last-Translator: Florian Delizy <florian.delizy@gmail.com>\n"
"Language-Team: Arabic (http://www.transifex.com/divio/django-cms/language/ar/)\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -106,6 +106,9 @@ msgstr "إعدادات التطبيق"
msgid "Language independent options"
msgstr "خيارات اللغة المستقلة"

msgid "You entered an invalid URL."
msgstr ""

#, python-format
msgid "Please set the %(language)s slug before editing its advanced settings."
msgstr "يرجى اختيار اسم لفرع الرابط باللغة %(language)s قبل تعديل إعداداته المتقدمة."
Expand Down Expand Up @@ -391,6 +394,24 @@ msgid ""
"href=\"%(page_url)s?edit\" target=\"_parent\">%(page_title)s</a> page."
msgstr "هذا مرجع مستعار ، بإمكانك تحرير المحتوى فقط على صفحة <a href=\"%(page_url)s?edit\" target=\"_parent\">%(page_title)s</a>"

msgid "Getting started developer guide"
msgstr ""

msgid "Documentation"
msgstr "توثيقات"

msgid "User guide"
msgstr ""

msgid "Support Forum"
msgstr ""

msgid "Support Slack"
msgstr ""

msgid "What's new"
msgstr ""

msgid "Create"
msgstr "إنشاء"

Expand Down Expand Up @@ -431,6 +452,9 @@ msgstr "تسجيل خروج"
msgid "Language"
msgstr "اللغة"

msgid "Help"
msgstr ""

msgid "Structure"
msgstr "الهيكل"

Expand Down Expand Up @@ -1352,9 +1376,6 @@ msgstr "ملاحظات التنصيب"
msgid "Support"
msgstr "دعم"

msgid "Documentation"
msgstr "توثيقات"

msgid ""
"\n"
" <p class=\"cms-welcome-notes\">If you don't see the django CMS logo at the top, make sure\n"
Expand Down Expand Up @@ -1558,6 +1579,15 @@ msgstr "إضافة ملحق إلى الموضع \"%(placeholder_label)s\""
msgid "Add plugin to %(plugin_name)s"
msgstr "إضافة ملحق إلى %(plugin_name)s"

msgid "Community forum"
msgstr ""

msgid "Getting started"
msgstr ""

msgid "Talk to us"
msgstr ""

msgid "CMS - your user account was created."
msgstr "نظام ادارة المحتوى - تم انشاء المستخدم."

Expand Down
40 changes: 35 additions & 5 deletions cms/locale/ca/LC_MESSAGES/django.po
Expand Up @@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-19 21:14+0800\n"
"PO-Revision-Date: 2021-05-19 13:14+0000\n"
"POT-Creation-Date: 2022-01-23 22:31+0800\n"
"PO-Revision-Date: 2021-10-18 15:36+0000\n"
"Last-Translator: Florian Delizy <florian.delizy@gmail.com>\n"
"Language-Team: Catalan (http://www.transifex.com/divio/django-cms/language/ca/)\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -100,6 +100,9 @@ msgstr "Configuracions d'aplicació"
msgid "Language independent options"
msgstr "Opcions independents d'idioma"

msgid "You entered an invalid URL."
msgstr ""

#, python-format
msgid "Please set the %(language)s slug before editing its advanced settings."
msgstr "Informeu l'slug en %(language)s abans d'editar la seva configuració avançada."
Expand Down Expand Up @@ -385,6 +388,24 @@ msgid ""
"href=\"%(page_url)s?edit\" target=\"_parent\">%(page_title)s</a> page."
msgstr ""

msgid "Getting started developer guide"
msgstr ""

msgid "Documentation"
msgstr "Documentació"

msgid "User guide"
msgstr ""

msgid "Support Forum"
msgstr ""

msgid "Support Slack"
msgstr ""

msgid "What's new"
msgstr ""

msgid "Create"
msgstr "Crear"

Expand Down Expand Up @@ -425,6 +446,9 @@ msgstr "Sortir"
msgid "Language"
msgstr "Idioma"

msgid "Help"
msgstr ""

msgid "Structure"
msgstr "Estructura"

Expand Down Expand Up @@ -1342,9 +1366,6 @@ msgstr "Notes de la instal·lació"
msgid "Support"
msgstr "Suport"

msgid "Documentation"
msgstr "Documentació"

msgid ""
"\n"
" <p class=\"cms-welcome-notes\">If you don't see the django CMS logo at the top, make sure\n"
Expand Down Expand Up @@ -1548,6 +1569,15 @@ msgstr ""
msgid "Add plugin to %(plugin_name)s"
msgstr ""

msgid "Community forum"
msgstr ""

msgid "Getting started"
msgstr ""

msgid "Talk to us"
msgstr ""

msgid "CMS - your user account was created."
msgstr "CMS - s'ha creat el vostre compte d'usuari."

Expand Down
40 changes: 35 additions & 5 deletions cms/locale/cs/LC_MESSAGES/django.po
Expand Up @@ -24,8 +24,8 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-19 21:14+0800\n"
"PO-Revision-Date: 2021-05-19 13:14+0000\n"
"POT-Creation-Date: 2022-01-23 22:31+0800\n"
"PO-Revision-Date: 2021-10-18 15:36+0000\n"
"Last-Translator: Florian Delizy <florian.delizy@gmail.com>\n"
"Language-Team: Czech (http://www.transifex.com/divio/django-cms/language/cs/)\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -113,6 +113,9 @@ msgstr "Konfigurace aplikace"
msgid "Language independent options"
msgstr "Nastavení nezávislé na jazyku"

msgid "You entered an invalid URL."
msgstr ""

#, python-format
msgid "Please set the %(language)s slug before editing its advanced settings."
msgstr "Prosím přiřaďte slug pro následující jazykovou mutaci před změnou pokročiých nastavení: %(language)s"
Expand Down Expand Up @@ -398,6 +401,24 @@ msgid ""
"href=\"%(page_url)s?edit\" target=\"_parent\">%(page_title)s</a> page."
msgstr "Toto je pouze reference odjinud, obsah lze upravovat pouze na stránce <a href=\"%(page_url)s?edit\" target=\"_parent\">%(page_title)s</a>."

msgid "Getting started developer guide"
msgstr ""

msgid "Documentation"
msgstr "Dokumentace"

msgid "User guide"
msgstr ""

msgid "Support Forum"
msgstr ""

msgid "Support Slack"
msgstr ""

msgid "What's new"
msgstr ""

msgid "Create"
msgstr "Vytvořit"

Expand Down Expand Up @@ -438,6 +459,9 @@ msgstr "Odhlásit"
msgid "Language"
msgstr "Jazyk"

msgid "Help"
msgstr ""

msgid "Structure"
msgstr "Struktura"

Expand Down Expand Up @@ -1357,9 +1381,6 @@ msgstr "Poznámky instalace"
msgid "Support"
msgstr "Podpora"

msgid "Documentation"
msgstr "Dokumentace"

msgid ""
"\n"
" <p class=\"cms-welcome-notes\">If you don't see the django CMS logo at the top, make sure\n"
Expand Down Expand Up @@ -1563,6 +1584,15 @@ msgstr "Přidat plugin do placeholderu „%(placeholder_label)s“"
msgid "Add plugin to %(plugin_name)s"
msgstr "Přidat plugin k %(plugin_name)s"

msgid "Community forum"
msgstr ""

msgid "Getting started"
msgstr ""

msgid "Talk to us"
msgstr ""

msgid "CMS - your user account was created."
msgstr "CMS - Váš uživatelský účet byl vytvořen."

Expand Down
40 changes: 35 additions & 5 deletions cms/locale/da/LC_MESSAGES/django.po
Expand Up @@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-19 21:14+0800\n"
"PO-Revision-Date: 2021-05-19 13:14+0000\n"
"POT-Creation-Date: 2022-01-23 22:31+0800\n"
"PO-Revision-Date: 2021-10-18 15:36+0000\n"
"Last-Translator: Florian Delizy <florian.delizy@gmail.com>\n"
"Language-Team: Danish (http://www.transifex.com/divio/django-cms/language/da/)\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -105,6 +105,9 @@ msgstr "Applikations konfigurationer"
msgid "Language independent options"
msgstr "Sprog uafhængige indstillinger"

msgid "You entered an invalid URL."
msgstr ""

#, python-format
msgid "Please set the %(language)s slug before editing its advanced settings."
msgstr ""
Expand Down Expand Up @@ -390,6 +393,24 @@ msgid ""
"href=\"%(page_url)s?edit\" target=\"_parent\">%(page_title)s</a> page."
msgstr ""

msgid "Getting started developer guide"
msgstr ""

msgid "Documentation"
msgstr ""

msgid "User guide"
msgstr ""

msgid "Support Forum"
msgstr ""

msgid "Support Slack"
msgstr ""

msgid "What's new"
msgstr ""

msgid "Create"
msgstr "Opret"

Expand Down Expand Up @@ -430,6 +451,9 @@ msgstr "Log ud"
msgid "Language"
msgstr "Sprog"

msgid "Help"
msgstr ""

msgid "Structure"
msgstr "Struktur"

Expand Down Expand Up @@ -1347,9 +1371,6 @@ msgstr ""
msgid "Support"
msgstr ""

msgid "Documentation"
msgstr ""

msgid ""
"\n"
" <p class=\"cms-welcome-notes\">If you don't see the django CMS logo at the top, make sure\n"
Expand Down Expand Up @@ -1553,6 +1574,15 @@ msgstr ""
msgid "Add plugin to %(plugin_name)s"
msgstr ""

msgid "Community forum"
msgstr ""

msgid "Getting started"
msgstr ""

msgid "Talk to us"
msgstr ""

msgid "CMS - your user account was created."
msgstr "CMS - din bruger blev oprettet."

Expand Down

0 comments on commit 8c8bb77

Please sign in to comment.