8000 ci: Merge back release 3.11.4 into `develop` by fsbraun · Pull Request #7646 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

ci: Merge back release 3.11.4 into develop #7646

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.

Sign up for GitHub

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 19 commits into from
Sep 18, 2023
Merged

ci: Merge back release 3.11.4 into develop #7646

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
11150c9
Merge pull request #7525 from fsbraun/develop
fsbraun Apr 17, 2023
44dcea6
build: release 3.11.2 (#7526)
fsbraun Apr 18, 2023
32243de
Update README.rst
fsbraun Apr 18, 2023
38cea48
build: merge develop into release/3.11.x (#7539)
fsbraun Apr 25, 2023
05d3e94
build: Merge build into release 3.11.x (#7540)
fsbraun Apr 25, 2023
04fde1c
Merge branch 'develop' into release/3.11.x
fsbraun Apr 25, 2023
3aeafa5
Merge branch 'release/3.11.x' into develop
fsbraun Aug 9, 2023
e61a31b
Fix ruff issues
fsbraun Aug 9, 2023
4c19dcc
Merge pull request #7625 from fsbraun/develop
fsbraun Aug 22, 2023
90b72eb
fix: Backport v4.1.0rc4 fixes - Admin language and 8000 styling (#7630) (#…
fsbraun Aug 30, 2023
0de09e3
Remove assets of 3.11.2
fsbraun Aug 30, 2023
c626022
fix: Toolbar action button becomes hard to read in dark mode
fsbraun Aug 31, 2023
f4bc246
ci: Merge 3.11.4 release build back into release/3.11.x (#7644)
fsbraun Sep 6, 2023
79cf53e
ci: Merge 3.11.4 build into `release/3.11.x` (#7645)
fsbraun Sep 6, 2023
706dadb
Update compatibility table
fsbraun Sep 7, 2023
9fee774
Fix: Correct language of help menu
fsbraun Sep 7, 2023
1158bcb
fix: remove double entries in Changelog
fsbraun Sep 8, 2023
8b4c1f2
Merge branch 'develop' into release/3.11.x
fsbraun Sep 8, 2023
52be978
Update CHANGELOG.rst
fsbraun Sep 17, 2023
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
Prev Previous commit
Next Next commit
Fix ruff issues
  • Loading branch information
@fsbraun
fsbraun committed Aug 9, 2023
commit e61a31b823c7e0fe523ee0066029ff0b155c4c0b
2 changes: 1 addition & 1 deletion cms/utils/check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ def check_i18n(output):
"'en_US'): '%s' provided" % lang[0])
if settings.SITE_ID == hash(settings.SITE_ID):
for site, items in get_cms_setting('LANGUAGES').items():
if type(site) == int:
if isinstance(site, int):
for lang in items:
if lang['code'].find('_') > -1:
section.warn("CMS_LANGUAGES entries must contain valid language codes, not locales (e.g.: "
Expand Down
2 changes: 1 addition & 1 deletion cms/utils/encoder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def _recursive_escape(self, o, esc=conditional_escape):
return type(o)((esc(k), self._recursive_escape(v)) for (k, v) in o.items())
if isinstance(o, (list, tuple)):
return type(o)(self._recursive_escape(v) for v in o)
if type(o) is bool:
if isinstance(o, bool):
return o
try:
return type(o)(esc(o))
Expand Down
0