8000 chore: Merge back build 4.1.3 into `release/4.1.x` (#8023) · django-cms/django-cms@b827cb2 · GitHub
[go: up one dir, main page]
Skip to content

Commit b827cb2

Browse files
fsbraunGithub Release Action
fsbraun
and
Github Release Action
authored
chore: Merge back build 4.1.3 into release/4.1.x (#8023)
* [4.1.3 release process] Building locales * [4.1.3 release process] Bumped version to 4.1.3 * [4.1.3 release process] compilemessages * [4.1.3 release process] compiling new static files * [4.1.3 release process] updating latest docs * Update CHANGELOG.rst * Update 4.1.3.rst * Update 4.1.3.rst * chore: Django 5.2-compatible test fixtures (#8008) * chore: Re-hook fixture loading to stay compatible with django 5.2 * Remove Postgres pin to v12 for testing * Exclude Py39 from dj51 * Pin postgres to version 15 * Switch from psycopg2 to recommended psycopg>=3.1.8 --------- Co-authored-by: Github Release Action <info@django-cms.org> * Update CHANGELOG.rst typo * chore: Backport #8021 * fix: Update databases.txt to include psycopg2 for Django < 4.2 * fix: Mark language and user middleware synchronous for ASGI (Backport of #7986) --------- Co-authored-by: Github Release Action <info@django-cms.org>
1 parent e4650ec commit b827cb2

39 files changed

+251
-97
lines changed

‎.github/workflows/test.yml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,25 @@ jobs:
1919< B41A /td>
django-4.0.txt,
2020
django-4.1.txt,
2121
django-4.2.txt,
22-
django-5.0.txt
22+
django-5.0.txt,
23+
django-5.1.txt,
2324
]
2425
os: [
2526
ubuntu-20.04,
2627
]
2728
exclude:
2829
- requirements-file: django-5.0.txt
2930
python-version: 3.8
31+
- requirements-file: django-5.1.txt
32+
python-version: 3.8
3033
- requirements-file: django-5.0.txt
3134
python-version: 3.9
35+
- requirements-file: django-5.1.txt
36+
python-version: 3.9
3237

3338
services:
3439
postgres:
35-
image: postgres:12
40+
image: postgres:15
3641
env:
3742
POSTGRES_USER: postgres
3843
POSTGRES_PASSWORD: postgres
@@ -78,16 +83,21 @@ jobs:
7883
django-4.0.txt,
7984
django-4.1.txt,
8085
django-4.2.txt,
81-
django-5.0.txt
86+
django-5.0.txt,
87+
django-5.1.txt,
8288
]
8389
os: [
8490
ubuntu-20.04,
8591
]
8692
exclude:
8793
- requirements-file: django-5.0.txt
8894
python-version: 3.8
95+
- requirements-file: django-5.1.txt
96+
python-version: 3.8
8997
- requirements-file: django-5.0.txt
9098
python-version: 3.9
99+
- requirements-file: django-5.1.txt
100+
python-version: 3.9
91101

92102
services:
93103
mysql:
@@ -136,14 +146,18 @@ jobs:
136146
django-4.0.txt,
137147
django-4.1.txt,
138148
django-4.2.txt,
139-
django-5.0.txt
149+
django-5.0.txt,
150+
django-5.0.txt,
151+
django-5.1.txt,
140152
]
141153
os: [
142154
ubuntu-20.04,
143155
]
144156
exclude:
145157
- requirements-file: django-5.0.txt
146158
python-version: 3.9
159+
- requirements-file: django-5.1.txt
160+
python-version: 3.9
147161

148162
steps:
149163
- uses: actions/checkout@v4
@@ -212,7 +226,7 @@ jobs:
212226

213227
services:
214228
postgres:
215-
image: postgres:13
229+
image: postgres:15
216230
env:
217231
POSTGRES_USER: postgres
218232
POSTGRES_PASSWORD: postgres

‎CHANGELOG.rst

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
4.1.3 (2024-09-11)
2+
==================
3+
4+
Bug Fixes:
5+
----------
6+
* Respect ContentAdminManager pattern for frontend-editable models (#7998) (e4650ecb7) -- Fabian Braun
7+
* Improve pagecontent caching in page admin (esp. page tree) (#8002) (842f347da) -- Fabian Braun
8+
* Clear menu cache if page permissions are changed (#7988) (1719b9a1b) -- Fabian Braun
9+
* Consistent labels and help texts for page content model and page content forms (#7968) (acbc2e70a) -- Fabian Braun
10+
* Inconsistent color codes for dark mode and `preferes-color-scheme: auto` (#7979) (46ff58321) -- Fabian Braun
11+
* Invalidate permissions cache if group assignment of user changes (ec05b6f2f) -- Fabian Braun
12+
* Accept legacy action names for page permission checks (#8021) (9a1e178) -- Fabian Braun
13+
* Mark language and user middleware synchronous for ASGI (#7985) -- John Bazik
14+
15+
Statistics:
16+
-----------
17+
18+
This release includes 6 pull requests, and was created with the help of the following contributors (in alphabetical order):
19+
20+
* Fabian Braun (6 pull request)
21+
22+
With the review help of the following contributors:
23+
24+
* Mark Walker
25+
* Vinit Kumar
26+
27+
Thanks to all contributors for their efforts!
28+
129
4.1.2 (2024-07-12)
230
==================
331

‎cms/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
__version__ = '4.1.2'
1+
__version__ = '4.1.3'
22

33
default_app_config = 'cms.apps.CMSConfig'

‎cms/locale/en/LC_MESSAGES/django.mo

-456 Bytes
Binary file not shown.

‎cms/locale/en/LC_MESSAGES/django.po

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: django-cms\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2024-07-10 10:40+0000\n"
11+
"POT-Creation-Date: 2024-09-22 11:36+0000\n"
1212
"PO-Revision-Date: 2015-11-11 17:31+0000\n"
1313
"Last-Translator: yakky <i.spalletti@nephila.it>\n"
1414
"Language-Team: English (http://www.transifex.com/divio/django-cms/language/"
@@ -25,37 +25,12 @@ msgstr "All"
2525
msgid "Copy permissions"
2626
msgstr "Copy permissions"
2727

28-
msgid "Title"
29-
msgstr "Title"
30-
31-
msgid "The default title"
32-
msgstr "The default title"
33-
3428
msgid "Slug"
3529
msgstr "Slug"
3630

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

40-
msgid "Menu Title"
41-
msgstr "Menu Title"
42-
43-
msgid "Overwrite what is displayed in the menu"
44-
msgstr "Overwrite what is displayed in the menu"
45-
46-
msgid "Page Title"
47-
msgstr "Page Title"
48-
49-
msgid "Overwrites what is displayed at the top of your browser or in bookmarks"
50-
msgstr ""
51-
"Overwrites what is displayed at the top of your browser or in bookmarks"
52-
53-
msgid "Description meta tag"
54-
msgstr "Description meta tag"
55-
56-
msgid "A description of the page used by search engines."
57-
msgstr "A description of the page used by search engines."
58-
5934
msgid "Page type"
6035
msgstr "Page type"
6136

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

71-
msgid "Soft root"
72-
msgstr "Soft root"
73-
74-
msgid "All ancestors will not be displayed in the navigation"
75-
msgstr "All ancestors will not be displayed in the navigation"
76-
77-
msgid "Redirect"
78-
msgstr "Redirect"
79-
80-
msgid "Redirects to this URL."
81-
msgstr "Redirects to this URL."
82-
8346
msgid "Start typing..."
8447
msgstr "Start typing..."
8548

@@ -673,21 +636,37 @@ msgstr "Allow"
673636
msgid "title"
674637
msgstr "title"
675638

676-
msgid "overwrite the title (html title tag)"
677-
msgstr "overwrite the title (html title tag)"
639+
msgid "The default title"
640+
msgstr "The default title"
641+
642+
msgid "Page Title"
643+
msgstr "Page Title"
644+
645+
msgid "Overwrites what is displayed at the top of your browser or in bookmarks"
646+
msgstr ""
647+
"Overwrites what is displayed at the top of your browser or in bookmarks"
678648

679-
msgid "overwrite the title in the menu"
680-
msgstr "overwrite the title in the menu"
649+
msgid "Menu Title"
650+
msgstr "Menu Title"
681651

682-
msgid "description"
683-
msgstr "description"
652+
msgid "Overwrite what is displayed in the menu"
653+
msgstr "Overwrite what is displayed in the menu"
684654

685-
msgid "The text displayed in search engines."
686-
msgstr "The text displayed in search engines."
655+
msgid "Description meta tag"
656+
msgstr "Description meta tag"
657+
658+
msgid "A description of the page used by search engines."
659+
msgstr "A description of the page used by search engines."
687660

688661
msgid "redirect"
689662
msgstr "redirect"
690663

664+
msgid "Redirects to this URL."
665+
msgstr "Redirects to this URL."
666+
667+
msgid "All ancestors will not be displayed in the navigation"
668+
msgstr "All ancestors will not be displayed in the navigation"
669+
691670
msgid "The template used to render the content."
692671
msgstr "The template used to render the content."
693672

@@ -1652,6 +1631,27 @@ msgstr "Create a new %s instance."
16521631
msgid "A wizard has already been registered for model: %s"
16531632
msgstr "A wizard has already been registered for model: %s"
16541633

1634+
#~ msgid "Title"
1635+
#~ msgstr "Title"
1636+
1637+
#~ msgid "Soft root"
1638+
#~ msgstr "Soft root"
1639+
1640+
#~ msgid "Redirect"
1641+
#~ msgstr "Redirect"
1642+
1643+
#~ msgid "overwrite the title (html title tag)"
1644+
#~ msgstr "overwrite the title (html title tag)"
1645+
1646+
#~ msgid "overwrite the title in the menu"
1647+
#~ msgstr "overwrite the title in the menu"
1648+
1649+
#~ msgid "description"
1650+
#~ msgstr "description"
1651+
1652+
#~ msgid "The text displayed in search engines."
1653+
#~ msgstr "The text displayed in search engines."
1654+
16551655
#~ msgid "You do not have permission to change a page's navigation status"
16561656
#~ msgstr "You do not have permission to change a page's navigation status"
16571657

‎cms/locale/es/LC_MESSAGES/django.mo

315 Bytes
Binary file not shown.

‎cms/locale/es/LC_MESSAGES/django.po

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
# jorlugaqui <jorlugaqui@gmail.com>, 2023
1111
# Luis Zárate <luisza@visualcon.net>, 2023
1212
# Fabian Braun <fsbraun@gmx.de>, 2023
13+
# Diego Alejandro Romero Mercado, 2024
1314
# Jonas Obrist <ojiidotch@gmail.com>, 2011
1415
msgid ""
1516
msgstr ""
1617
"Project-Id-Version: django-cms\n"
1718
"Report-Msgid-Bugs-To: \n"
1819
"POT-Creation-Date: 2023-08-23 12:21+0000\n"
1920
"PO-Revision-Date: 2022-12-12 10:32+0000\n"
20-
"Last-Translator: Fabian Braun <fsbraun@gmx.de>, 2023\n"
21+
"Last-Translator: Diego Alejandro Romero Mercado, 2024\n"
2122
"Language-Team: Spanish (https://app.transifex.com/divio/teams/58664/es/)\n"
2223
"MIME-Version: 1.0\n"
2324
"Content-Type: text/plain; charset=UTF-8\n"
@@ -566,10 +567,10 @@ msgstr ""
566567
"Dejar en blanco para un slug automático, o configurar como sea necesario."
567568

568569
msgid "Cannot automatically create slug. Please provide one manually."
569-
msgstr ""
570+
msgstr "No se puede crear slug automáticamente. Proporcione uno manualmente."
570571

571572
msgid "Please provide a valid slug."
572-
msgstr ""
573+
msgstr "Por favor proporcione un slug válido"
573574

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

10531054
msgid "last change on"
1054-
msgstr ""
1055+
msgstr "Último cambio por"
10551056

10561057
msgid "meta"
10571058
msgstr "meta"

‎cms/middleware/language.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010

1111
class LanguageCookieMiddleware(MiddlewareMixin):
12+
async_capable = False
13+
1214
def __init__(self, get_response):
1315
super().__init__(get_response)
1416

‎cms/middleware/user.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88

99
class CurrentUserMiddleware(MiddlewareMixin):
10+
async_capable = False
11+
1012
def process_request(self, request):
1113
from cms.utils.permissions import set_current_user
1214

‎cms/static/cms/css/4.1.2/cms.admin.css renamed to ‎cms/static/cms/css/4.1.3/cms.admin.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cms/static/cms/css/4.1.2/cms.base.css renamed to ‎cms/static/cms/css/4.1.3/cms.base.css

Lines changed: 1 addition 57F6 & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cms/static/cms/css/4.1.2/cms.pagetree.css renamed to ‎cms/static/cms/css/4.1.3/cms.pagetree.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
0