8000 chore: Merge back build 4.1.3 into `release/4.1.x` by fsbraun · Pull Request #8023 · django-cms/django-cms · GitHub
[go: up one dir, main page]

Skip to content

chore: Merge back build 4.1.3 into release/4.1.x #8023

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 13 commits into from
Oct 7, 2024
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
24 changes: 19 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,25 @@ jobs:
django-4.0.txt,
django-4.1.txt,
django-4.2.txt,
django-5.0.txt
django-5.0.txt,
django-5.1.txt,
]
os: [
ubuntu-20.04,
]
exclude:
- requirements-file: django-5.0.txt
python-version: 3.8
- requirements-file: django-5.1.txt
python-version: 3.8
- requirements-file: django-5.0.txt
python-version: 3.9
- requirements-file: django-5.1.txt
python-version: 3.9

services:
postgres:
image: postgres:12
image: postgres:15
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
Expand Down Expand Up @@ -78,16 +83,21 @@ jobs:
django-4.0.txt,
django-4.1.txt,
django-4.2.txt,
django-5.0.txt
django-5.0.txt,
django-5.1.txt,
]
os: [
ubuntu-20.04,
]
exclude:
- requirements-file: django-5.0.txt
python-version: 3.8
- requirements-file: django-5.1.txt
python-version: 3.8
- requirements-file: django-5.0.txt
python-version: 3.9
- requirements-file: django-5.1.txt
python-version: 3.9

services:
mysql:
Expand Down Expand Up @@ -136,14 +146,18 @@ jobs:
django-4.0.txt,
django-4.1.txt,
django-4.2.txt,
django-5.0.txt
django-5.0.txt,
django-5.0.txt,
django-5.1.txt,
]
os: [
ubuntu-20.04,
]
exclude:
- requirements-file: django-5.0.txt
python-version: 3.9
- requirements-file: django-5.1.txt
python-version: 3.9

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -212,7 +226,7 @@ jobs:

services:
postgres:
image: postgres:13
image: postgres:15
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
Expand Down
28 changes: 28 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
4.1.3 (2024-09-11)
==================

Bug Fixes:
----------
* Respect ContentAdminManager pattern for frontend-editable models (#7998) (e4650ecb7) -- Fabian Braun
* Improve pagecontent caching in page admin (esp. page tree) (#8002) (842f347da) -- Fabian Braun
* Clear menu cache if page permissions are changed (#7988) (1719b9a1b) -- Fabian Braun
* Consistent labels and help texts for page content model and page content forms (#7968) (acbc2e70a) -- Fabian Braun
* Inconsistent color codes for dark mode and `preferes-color-scheme: auto` (#7979) (46ff58321) -- Fabian Braun
* Invalidate permissions cache if group assignment of user changes (ec05b6f2f) -- Fabian Braun
* Accept legacy action names for page permission checks (#8021) (9a1e178) -- Fabian Braun
* Mark language and user middleware synchronous for ASGI (#7985) -- John Bazik

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

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

* Fabian Braun (6 pull request)

With the review help of the following contributors:

* Mark Walker
* Vinit Kumar

Thanks to all contributors for their efforts!

4.1.2 (2024-07-12)
==================

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.2'
__version__ = '4.1.3'

default_app_config = 'cms.apps.CMSConfig'
Binary file modified cms/locale/en/LC_MESSAGES/django.mo
Binary file not shown.
92 changes: 46 additions & 46 deletions cms/locale/en/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: 2024-07-10 10:40+0000\n"
"POT-Creation-Date: 2024-09-22 11:36+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/"
Expand All @@ -25,37 +25,12 @@ msgstr "All"
msgid "Copy permissions"
msgstr "Copy permissions"

msgid "Title"
msgstr "Title"

msgid "The default title"
msgstr "The default title"

msgid "Slug"
msgstr "Slug"

msgid "The part of the title that is used in the URL"
msgstr "The part of the title that is used in the URL"

msgid "Menu Title"
msgstr "Menu Title"

msgid "Overwrite what is displayed in the menu"
msgstr "Overwrite what is displayed in the menu"

msgid "Page Title"
msgstr "Page Title"

msgid "Overwrites what is displayed at the top of your browser or in bookmarks"
msgstr ""
"Overwrites what is displayed at the top of your browser or in bookmarks"

msgid "Description meta tag"
msgstr "Description meta tag"

msgid "A description of the page used by search engines."
msgstr "A description of the page used by search engines."

msgid "Page type"
msgstr "Page type"

Expand All @@ -68,18 +43,6 @@ msgstr "Overwrite URL"
msgid "Keep this field empty if standard path should be used."
msgstr "Keep this field empty if standard path should be used."

msgid "Soft root"
msgstr "Soft root"

msgid "All ancestors will not be displayed in the navigation"
msgstr "All ancestors will not be displayed in the navigation"

msgid "Redirect"
msgstr "Redirect"

msgid "Redirects to this URL."
msgstr "Redirects to this URL."

msgid "Start typing..."
msgstr "Start typing..."

Expand Down Expand Up @@ -673,21 +636,37 @@ msgstr "Allow"
msgid "title"
msgstr "title"

msgid "overwrite the title (html title tag)"
msgstr "overwrite the title (html title tag)"
msgid "The default title"
msgstr "The default title"

msgid "Page Title"
msgstr "Page Title"

msgid "Overwrites what is displayed at the top of your browser or in bookmarks"
msgstr ""
"Overwrites what is displayed at the top of your browser or in bookmarks"

msgid "overwrite the title in the menu"
msgstr "overwrite the title in the menu"
msgid "Menu Title"
msgstr "Menu Title"

msgid "description"
msgstr "description"
msgid "Overwrite what is displayed in the menu"
msgstr "Overwrite what is displayed in the menu"

msgid "The text displayed in search engines."
msgstr "The text displayed in search engines."
msgid "Description meta tag"
msgstr "Description meta tag"

msgid "A description of the page used by search engines."
msgstr "A description of the page used by search engines."

msgid "redirect"
msgstr "redirect"

msgid "Redirects to this URL."
msgstr "Redirects to this URL."

msgid "All ancestors will not be displayed in the navigation"
msgstr "All ancestors will not be displayed in the navigation"

msgid "The template used to render the content."
msgstr "The template used to render the content."

Expand Down Expand Up @@ -1652,6 +1631,27 @@ 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 "Title"
#~ msgstr "Title"

#~ msgid "Soft root"
#~ msgstr "Soft root"

#~ msgid "Redirect"
#~ msgstr "Redirect"

#~ msgid "overwrite the title (html title tag)"
#~ msgstr "overwrite the title (html title tag)"

#~ msgid "overwrite the title in the menu"
#~ msgstr "overwrite the title in the menu"

#~ msgid "description"
#~ msgstr "description"

#~ msgid "The text displayed in search engines."
#~ msgstr "The text displayed in search engines."

#~ msgid "You do not have permission to change a page's navigation status"
#~ msgstr "You do not have permission to change a page's navigation status"

Expand Down
Binary file modified cms/locale/es/LC_MESSAGES/django.mo
Binary file not shown.
9 changes: 5 additions & 4 deletions cms/locale/es/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@
# jorlugaqui <jorlugaqui@gmail.com>, 2023
# Luis Zárate <luisza@visualcon.net>, 2023
# Fabian Braun <fsbraun@gmx.de>, 2023
# Diego Alejandro Romero Mercado, 2024
# Jonas Obrist <ojiidotch@gmail.com>, 2011
msgid ""
msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: \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"
"Last-Translator: Diego Alejandro Romero Mercado, 2024\n"
"Language-Team: Spanish (https://app.transifex.com/divio/teams/58664/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -566,10 +567,10 @@ msgstr ""
"Dejar en blanco para un slug automático, o configurar como sea necesario."

msgid "Cannot automatically create slug. Please provide one manually."
msgstr ""
msgstr "No se puede crear slug automáticamente. Proporcione uno manualmente."

msgid "Please provide a valid slug."
msgstr ""
msgstr "Por favor proporcione un slug válido"

msgid "You don't have the permissions required to add a page."
msgstr "No tiene los permisos necesarios para agregar una página."
Expand Down Expand Up @@ -1051,7 +1052,7 @@ msgid "last change by"
msgstr "ultimo cambio por"

msgid "last change on"
msgstr ""
msgstr "Último cambio por"

msgid "meta"
msgstr "meta"
Expand Down
2 changes: 2 additions & 0 deletions cms/middleware/language.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@


class LanguageCookieMiddleware(MiddlewareMixin):
async_capable = False

def __init__(self, get_response):
super().__init__(get_response)

Expand Down
2 changes: 2 additions & 0 deletions cms/middleware/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@


class CurrentUserMiddleware(MiddlewareMixin):
async_capable = False

def process_request(self, request):
from cms.utils.permissions import set_current_user

Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Loading
Loading
0