Skip to content

ci: Merge back 4.1.0.rc5 build into release/4.1.x #7720

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 8 commits into from
Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 22 additions & 0 deletions .github/workflows/releases.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Comment on PRs into release/* branches

on:
pull_request:
branches:
- release/*

jobs:
comment:
runs-on: ubuntu-latest
steps:
- name: Comment on PR
uses: actions/github-script@v5
with:
github-token: ${{secrets.GITHUB_TOKEN}}
script: |
github.rest.issues.createComment({
issue_number: context.issue.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.'
})
12 changes: 9 additions & 3 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
4.1.0rc4 (unpublished)
4.1.0rc5 (unpublished)
======================

Features:
Expand Down Expand Up @@ -53,13 +53,13 @@ Bug Fixes:
Statistics:
-----------

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

* Adam Murray (2 pull requests)
* Aiky30 (35 pull requests)
* Andrew Aikman (1 pull request)
* Chematronix (1 pull request)
* Fabian Braun (73 pull requests)
* Fabian Braun (83 pull requests)
* Github Release Action (4 pull requests)
* Jacob Rief (2 pull requests)
* Jonathan Sundqvist (7 pull requests)
Expand All @@ -76,6 +76,7 @@ This release includes 191 pull requests, and was created with the help of the fo
* anirbanlahiri-fidelity (1 pull request)
* monikasulik (3 pull requests)

With the review help of the following contributors:

* Adam Murray
* Aiky30
Expand All @@ -86,6 +87,7 @@ This release includes 191 pull requests, and was created with the help of the fo
* Florian Delizy
* Github Release Action
* Iacopo Spalletti
* Jacob Rief
* Krzysztof Socha
* Marco Bonetti
* Mark Walker
Expand All @@ -94,7 +96,11 @@ This release includes 191 pull requests, and was created with the help of the fo
* Raffaele Salmaso
* Stuart Axon
* Vinit Kumar
* Will Hoey
* dwintergruen
* pajowu
* wfehr
* wintergruen
* Éric Araujo

Thanks to all contributors for their efforts!
Expand Down
2 changes: 1 addition & 1 deletion cms/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
__version__ = '4.1.0rc4'
__version__ = '4.1.0rc5'

default_app_config = 'cms.apps.CMSConfig'
5 changes: 4 additions & 1 deletion cms/locale/af/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-22 12:50+0200\n"
"POT-Creation-Date: 2023-08-23 12:21+0000\n"
"PO-Revision-Date: 2022-12-12 10:32+0000\n"
"Language-Team: Afrikaans (https://app.transifex.com/divio/teams/58664/af/)\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -1550,3 +1550,6 @@ msgstr ""
#, python-format
msgid "A wizard has already been registered for model: %s"
msgstr ""

#~ msgid "Slug must not be empty."
#~ msgstr ""
Binary file modified cms/locale/af/LC_MESSAGES/djangojs.mo
Binary file not shown.
12 changes: 4 additions & 8 deletions cms/locale/af/LC_MESSAGES/djangojs.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,24 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-30 16:56+0000\n"
"POT-Creation-Date: 2022-11-05 20:40+0100\n"
"PO-Revision-Date: 2010-11-30 06:49+0000\n"
"Last-Translator: yakky <i.spalletti@nephila.it>\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Afrikaans (http://app.transifex.com/divio/django-cms/language/af/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: af\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

msgid "pathname"
msgstr ""

msgid "urnpath"
msgid "/"
msgstr ""

msgid "reserved"
msgid ":"
msgstr ""

msgid "Are you sure you want to change tabs without saving the page first?"
Expand Down
Binary file modified cms/locale/ar/LC_MESSAGES/django.mo
Binary file not shown.
9 changes: 6 additions & 3 deletions cms/locale/ar/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# Fabian Braun <fsbraun@gmx.de>, 2023
# Bashar Ghadanfar <10.tens@gmail.com>, 2023
# Bashar Al-Abdulhadi, 2023
# Ali Khalel <ali.khalel@gmail.com>, 2023
# Fabian Braun <fsbraun@gmx.de>, 2023
# Jonas Obrist <ojiidotch@gmail.com>, 2011
msgid ""
msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-22 12:50+0200\n"
"POT-Creation-Date: 2023-08-23 12:21+0000\n"
"PO-Revision-Date: 2022-12-12 10:32+0000\n"
"Last-Translator: Ali Khalel <ali.khalel@gmail.com>, 2023\n"
"Last-Translator: Fabian Braun <fsbraun@gmx.de>, 2023\n"
"Language-Team: Arabic (https://app.transifex.com/divio/teams/58664/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -1610,3 +1610,6 @@ msgstr "إنشاء مثيل %s جديد."
#, python-format
msgid "A wizard has already been registered for model: %s"
msgstr "عُثر على برنامج وِزارد مسجل سلفاً للنموذج: %s"

#~ msgid "Slug must not be empty."
#~ msgstr "حقل الـ Slug يجب ان لا يكون فارغا"
10 changes: 3 additions & 7 deletions cms/locale/ar/LC_MESSAGES/djangojs.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# Translators:
# Abdelkader Maarouf <dep2g2@gmail.com>, 2015
# Ahmed H <info@draco-003.com>, 2013
# Bashar Al-Abdulhadi, 2017
Expand All @@ -13,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-30 16:56+0000\n"
"POT-Creation-Date: 2022-11-05 20:40+0100\n"
"PO-Revision-Date: 2010-11-30 06:49+0000\n"
"Last-Translator: Bashar Ghadanfar <10.tens@gmail.com>, 2017\n"
"Language-Team: Arabic (http://app.transifex.com/divio/django-cms/language/ar/)\n"
Expand All @@ -23,13 +22,10 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"

msgid "pathname"
msgstr ""

msgid "urnpath"
msgid "/"
msgstr ""

msgid "reserved"
msgid ":"
msgstr ""

msgid "Are you sure you want to change tabs without saving the page first?"
Expand Down
5 changes: 4 additions & 1 deletion cms/locale/ar_SA/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-22 12:50+0200\n"
"POT-Creation-Date: 2023-08-23 12:21+0000\n"
"PO-Revision-Date: 2022-12-12 10:32+0000\n"
"Language-Team: Arabic (Saudi Arabia) (https://app.transifex.com/divio/teams/58664/ar_SA/)\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -1554,3 +1554,6 @@ msgstr ""
#, python-format
msgid "A wizard has already been registered for model: %s"
msgstr ""

#~ msgid "Slug must not be empty."
#~ msgstr ""
Binary file modified cms/locale/ar_SA/LC_MESSAGES/djangojs.mo
Binary file not shown.
12 changes: 4 additions & 8 deletions cms/locale/ar_SA/LC_MESSAGES/djangojs.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,24 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-30 16:56+0000\n"
"POT-Creation-Date: 2022-11-05 20:40+0100\n"
"PO-Revision-Date: 2010-11-30 06:49+0000\n"
"Last-Translator: yakky <i.spalletti@nephila.it>\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Arabic (Saudi Arabia) (http://app.transifex.com/divio/django-cms/language/ar_SA/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ar_SA\n"
"Plural-Forms: nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5);\n"

msgid "pathname"
msgstr ""

msgid "urnpath"
msgid "/"
msgstr ""

msgid "reserved"
msgid ":"
msgstr ""

msgid "Are you sure you want to change tabs without saving the page first?"
Expand Down
5 changes: 4 additions & 1 deletion cms/locale/be/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-22 12:50+0200\n"
"POT-Creation-Date: 2023-08-23 12:21+0000\n"
"PO-Revision-Date: 2022-12-12 10:32+0000\n"
"Language-Team: Belarusian (https://app.transifex.com/divio/teams/58664/be/)\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -1552,3 +1552,6 @@ msgstr ""
#, python-format
msgid "A wizard has already been registered for model: %s"
msgstr ""

#~ msgid "Slug must not be empty."
#~ msgstr ""
Binary file modified cms/locale/be/LC_MESSAGES/djangojs.mo
Binary file not shown.
12 changes: 4 additions & 8 deletions cms/locale/be/LC_MESSAGES/djangojs.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,24 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-30 16:56+0000\n"
"POT-Creation-Date: 2022-11-05 20:40+0100\n"
"PO-Revision-Date: 2010-11-30 06:49+0000\n"
"Last-Translator: yakky <i.spalletti@nephila.it>\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Belarusian (http://app.transifex.com/divio/django-cms/language/be/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: be\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"

msgid "pathname"
msgstr ""

msgid "urnpath"
msgid "/"
msgstr ""

msgid "reserved"
msgid ":"
msgstr ""

msgid "Are you sure you want to change tabs without saving the page first?"
Expand Down
5 changes: 4 additions & 1 deletion cms/locale/bg/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-22 12:50+0200\n"
"POT-Creation-Date: 2023-08-23 12:21+0000\n"
"PO-Revision-Date: 2022-12-12 10:32+0000\n"
"Last-Translator: Fabian Braun <fsbraun@gmx.de>, 2023\n"
"Language-Team: Bulgarian (https://app.transifex.com/divio/teams/58664/bg/)\n"
Expand Down Expand Up @@ -1565,3 +1565,6 @@ msgstr ""
#, python-format
msgid "A wizard has already been registered for model: %s"
msgstr ""

#~ msgid "Slug must not be empty."
#~ msgstr "Слъгът не трябва да бъде празен."
10 changes: 3 additions & 7 deletions cms/locale/bg/LC_MESSAGES/djangojs.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# Translators:
# Boris Chervenkov <office@sentido.bg>, 2012
# Boyko Amarov <boyko.amarov@gmail.com>, 2013
# suleyman <posta@suleymans.com>, 2011
msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-30 16:56+0000\n"
"POT-Creation-Date: 2022-11-05 20:40+0100\n"
"PO-Revision-Date: 2010-11-30 06:49+0000\n"
"Last-Translator: suleyman <posta@suleymans.com>, 2011\n"
"Language-Team: Bulgarian (http://app.transifex.com/divio/django-cms/language/bg/)\n"
Expand All @@ -21,13 +20,10 @@ msgstr ""
"Language: bg\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

msgid "pathname"
msgstr ""

msgid "urnpath"
msgid "/"
msgstr ""

msgid "reserved"
msgid ":"
msgstr ""

msgid "Are you sure you want to change tabs without saving the page first?"
Expand Down
5 changes: 4 additions & 1 deletion cms/locale/bn/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-22 12:50+0200\n"
"POT-Creation-Date: 2023-08-23 12:21+0000\n"
"PO-Revision-Date: 2022-12-12 10:32+0000\n"
"Last-Translator: Fabian Braun <fsbraun@gmx.de>, 2022\n"
"Language-Team: Bengali (https://app.transifex.com/divio/teams/58664/bn/)\n"
Expand Down Expand Up @@ -1553,3 +1553,6 @@ msgstr ""
#, python-format
msgid "A wizard has already been registered for model: %s"
msgstr ""

#~ msgid "Slug must not be empty."
#~ msgstr ""
10 changes: 3 additions & 7 deletions cms/locale/bn/LC_MESSAGES/djangojs.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# Translators:
# Aniruddha Adhikary <aniruddha@adhikary.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-30 16:56+0000\n"
"POT-Creation-Date: 2022-11-05 20:40+0100\n"
"PO-Revision-Date: 2010-11-30 06:49+0000\n"
"Last-Translator: Aniruddha Adhikary <aniruddha@adhikary.net>, 2013\n"
"Language-Team: Bengali (http://app.transifex.com/divio/django-cms/language/bn/)\n"
Expand All @@ -19,13 +18,10 @@ msgstr ""
"Language: bn\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

msgid "pathname"
msgstr ""

msgid "urnpath"
msgid "/"
msgstr ""

msgid "reserved"
msgid ":"
msgstr ""

msgid "Are you sure you want to change tabs without saving the page first?"
Expand Down
5 changes: 4 additions & 1 deletion cms/locale/ca/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-22 12:50+0200\n"
"POT-Creation-Date: 2023-08-23 12:21+0000\n"
"PO-Revision-Date: 2022-12-12 10:32+0000\n"
"Last-Translator: Fabian Braun <fsbraun@gmx.de>, 2023\n"
"Language-Team: Catalan (https://app.transifex.com/divio/teams/58664/ca/)\n"
Expand Down Expand Up @@ -1598,3 +1598,6 @@ msgstr "Crear una nova %s instància."
#, python-format
msgid "A wizard has already been registered for model: %s"
msgstr "Ja hi ha un assistent registrat per al model: %s"

#~ msgid "Slug must not be empty."
#~ msgstr "L'slug no pot estar en blanc."
Loading