10000 ci: Sync release/3.10.x with develop by marksweb · Pull Request #7328 · django-cms/django-cms · GitHub
[go: up one dir, main page]

Skip to content

ci: Sync release/3.10.x with develop #7328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
May 24, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5f4814b
Release 3.10.0 RC1 (#7215)
Feb 1, 2022
c7d4e15
Update release/3.10 from develop (#7219)
marksweb Feb 8, 2022
2f8cb35
Add toolbar fix for broken CMS in the release 3.10.x (#7233)
vinitkumar Feb 10, 2022
3e5227d
fix: using .nvmrc to target teh right nvm version
Mar 5, 2022
822fbab
Release/3.10.x (#7260) Releasing 3.10.0RC2
Mar 5, 2022
d415b84
Update release script to make it compatible with BSD (macos) compatible
marksweb Mar 24, 2022
9e93ac9
Update release script to make it compatible with BSD (macos) compatible
marksweb Mar 24, 2022
7a363eb
Merge remote-tracking branch 'upstream/develop' into develop
marksweb Mar 24, 2022
0aa37dc
Merge remote-tracking branch 'upstream/develop' into develop
marksweb Mar 24, 2022
afd8def
Release/3.10.x (#7275)
Mar 26, 2022
5714a8f
Fixes #7288 by also catching AttributeError, when the current toolbar…
mbi Mar 31, 2022
40a818c
Merge branch 'django-cms:develop' into develop
marksweb Apr 2, 2022
e707f6a
Fix for django 2.2 in middleware [#7290] (#7293)
marksweb Apr 4, 2022
3531372
Update release script to make it compatible with BSD (macos) compatib…
marksweb Apr 4, 2022
5d33733
Merge branch 'django-cms:develop' into develop
marksweb Apr 4, 2022
1cb3dc5
Fix release script version commit. (#7295)
marksweb Apr 4, 2022
20cd347
Merge branch 'django-cms:develop' into develop
marksweb Apr 20, 2022
8914915
Merge branch 'django-cms:develop' into develop
marksweb May 22, 2022
00ab32c
Merge branch 'develop' of github.com:django-cms/django-cms into develop
marksweb May 23, 2022
ce8b47e
Merge branch 'release/3.10.x' into develop
marksweb May 24, 2022
ea18ce1
fix: typos in CHANGELOG.rst
marksweb May 24, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Release 3.10.0 RC1 (#7215)
* [3.10.0rc1 release process] Bumped version to 3.10.0rc1
* [3.10.0rc1 release process] compilemessages
* [3.10.0rc1 release process] compiling new static files
* [3.10.0rc1 release process] updating latest docs
  • Loading branch information
Florian Delizy authored Feb 1, 2022
commit 5f4814b2e60ad9c9cbf9caaef760e4dcfac921f9
62 changes: 60 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,66 @@ Changelog
=========


unreleased
==========
3.10.0rc1 (unpublished)
=======================

Highlights:
-----------

This feature focuses on bringing python 3.10 support, bringing build system to latest nodejs, and bugfixes

Features:
---------
* python3.10 support (#7126) (324f08594) -- Vinit Kumar
* improve build performance (#7192) (bdb04bc31) -- Vinit Kumar

Bug Fixes:
----------
* fixing release script to use 'unreleased' (low caps) instead of mixed caps (#7202) (b7a793c88) -- Florian Delizy
* 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 54 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 (7 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 (9 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 (4 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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
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-02-01 23:19+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
Original file line number Diff line number Diff line change
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-02-01 23:19+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
Original file line number Diff line number Diff line change
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-02-01 23:19+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
Loading
0