Skip to content
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

build: merge back release/3.11.x into develop #7541

Merged
merged 88 commits into from Apr 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 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
373579f
Update release script to make it compatible with BSD (macos) compatible
marksweb Mar 24, 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
3ba9bb3
Merge branch 'django-cms:release/3.10.x' into release/3.10.x
marksweb Apr 4, 2022
862a0f6
Fix version number in bump commit
marksweb Apr 4, 2022
1cb3dc5
Fix release script version commit. (#7295)
marksweb Apr 4, 2022
5e2d7a7
Merge branch 'django-cms:release/3.10.x' into release/3.10.x
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
f892d6e
build: Release 3.11.0rc1 (#7326)
creyD May 24, 2022
ce8b47e
Merge branch 'release/3.10.x' into develop
marksweb May 24, 2022
ea18ce1
fix: typos in CHANGELOG.rst
marksweb May 24, 2022
322c6da
Merge remote-tracking branch 'upstream/develop' into develop
marksweb Jun 1, 2022
51ab0c5
build: release 3.10.1rc1 (#7330)
creyD Jun 1, 2022
da05c2e
Merge branch 'django-cms:develop' into develop
marksweb Jun 1, 2022
3db198c
Merge branch 'django-cms:release/3.10.x' into release/3.10.x
marksweb Jun 1, 2022
a91ac91
fix: Use http rather than https in toolbar sites menu (#7331)
marksweb Jun 1, 2022
caddfe7
fix: Revert change to the toolbar sites menu to use ``http`` protocol…
marksweb Jun 1, 2022
fbfe723
Merge remote-tracking branch 'upstream/develop' into develop
marksweb Jun 15, 2022
1c87eae
Merge branch 'django-cms:develop' into develop
marksweb Jun 23, 2022
abd384c
Merge branch 'release/3.10.x' of github.com:django-cms/django-cms int…
marksweb Jun 27, 2022
e54dc30
fix: Rename changelog title to fix release script
marksweb Jun 27, 2022
966a90f
fix: Changelog title for 3.10.1rc1 (#7345)
marksweb Jun 27, 2022
993b3c9
Merge branch 'django-cms:release/3.10.x' into release/3.10.x
marksweb Jun 27, 2022
eff54b0
fix: Request missing from test rendering (#7346)
marksweb Jun 27, 2022
32afa2f
Merge branch 'django-cms:release/3.10.x' into release/3.10.x
marksweb Jun 27, 2022
31f3995
fix: Changelog titles for 3.10.x (#7347)
marksweb Jun 27, 2022
e84de57
Merge branch 'django-cms:release/3.10.x' into release/3.10.x
marksweb Jun 27, 2022
446e39d
build: Release 3.10.1 (#7348)
creyD Jun 27, 2022
58ad645
Merge branch 'django-cms:release/3.10.x' into release/3.10.x
marksweb Jun 27, 2022
cda666b
ci: Merging 3.10.1
marksweb Jun 27, 2022
e8d96c1
Merge branch 'develop' into release/3.11.x
marksweb Jun 28, 2022
0c9c9aa
ci: Merge develop into release/3.11 (#7350)
marksweb Jun 28, 2022
32a1342
Update CHANGELOG.rst
marksweb Jun 28, 2022
041e47b
Update CHANGELOG.rst
marksweb Jun 28, 2022
fc3952e
Update CHANGELOG.rst
marksweb Jun 28, 2022
76ca579
Update CHANGELOG.rst
marksweb Jun 28, 2022
95d8b7b
Update docs/upgrade/3.10.1.rst
marksweb Jun 28, 2022
70119a5
Merge branch 'django-cms:develop' into develop
marksweb Jun 28, 2022
20be9b1
Merge branch 'django-cms:release/3.11.x' into release/3.11.x
marksweb Jun 28, 2022
1fbf7b8
Merge branch 'develop' into release/3.11.x
marksweb Jun 28, 2022
faf4bf1
ci: Flake8 fixes (#7372)
marksweb Aug 1, 2022
34de125
Add release candidate to changelog version
marksweb Aug 2, 2022
2744777
Change 3.11.0rc1 release date to fix `make-changelog`
marksweb Aug 2, 2022
af7b38d
build: Release 3.11.0 (#7373)
creyD Aug 2, 2022
a492386
fix: Added language to page cache key (#7354)
marksweb Jul 3, 2022
a52fc70
Update install.rst (#7368)
dapoadedire Jul 24, 2022
c9f134c
Updated changelog for 3.11.0
marksweb Aug 2, 2022
f99ba69
feat: Release/3.11.1 (#7431)
fsbraun Nov 8, 2022
7c9fe65
feat: Add github actions for publishing on pyi (#7438)
fsbraun Nov 14, 2022
6105262
build: Release v3.11.1 (#7455)
fsbraun Dec 12, 2022
7aaddd4
fix: Build docs always from the current local version (#7472) (#7475)
fsbraun Jan 11, 2023
25b2303
feat: add download statistics to readme (#7474)
fsbraun Jan 11, 2023
ca8f75b
docs: Added note to publish_pages API docs about it being a generator…
jasperbok Jan 22, 2023
6cb4762
fix: Link both user and group from global page permissions to change …
fsbraun Jan 24, 2023
bdd10ae
Make messages readable in dark mode, remove iOS9 compatibility trick …
fsbraun Jan 24, 2023
b4acc9a
fix: replace ' by ′ in fr translation − no more "page d\u0027accueil"…
corentinbettiol Jan 25, 2023
45e78dd
docs: Update formatting in how-to/install.rst to avoid misunderstandi…
fsbraun Feb 5, 2023
dcb9c4b
feat: add setting so redirect preserve params (#7489)
igobranco Feb 7, 2023
327a86f
improved code readability (#7503)
deepbluesquirrel Feb 13, 2023
01aedee
feat: add setting to redirect slugs to lowercase (#7509)
pajowu Mar 8, 2023
9a3d647
docs: Update incomplete color scheme docs (#7512)
fsbraun Mar 23, 2023
04a85d3
fix typos (#7514)
wasertech Mar 28, 2023
5478faa
feat: add django 4.2 support (#7481)
vinitkumar Apr 10, 2023
187ea98
ci: more deprecations in light of upcoming v4 (#7480)
fsbraun Apr 10, 2023
6833976
ci: introduce ruff in place of flake8 for improved speed (#7504)
vinitkumar Apr 10, 2023
f57d516
Merge branch 'develop' of github.com:fsbraun/django-cms into fsbraun-…
fsbraun Apr 16, 2023
41da65d
Merge branch 'fsbraun-develop' into develop
fsbraun Apr 16, 2023
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
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 26 additions & 0 deletions CHANGELOG.rst
Expand Up @@ -2,6 +2,32 @@
Changelog
=========

3.11.3 (2023-04-25)
===================

Bug Fixes:
----------
* Remove superfluous curly bracket left behind on PR 7488 (#7529) -- Corentin Bettiol
* Fix admin tests (#6848) for some post requests (#7535) -- Fabian Braun

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

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

* Corentin Bettiol (1 pull request)
* Fabian Braun (1 pull requests)

With the review help of the following contributors:

* Fabian Braun
* Vinit Kumar

Thanks to all contributors for their efforts!

3.11.2 (2023-04-18)
===================

Features:
---------
* add django 4.2 support (#7481) (5478faa5c) -- Vinit Kumar
Expand Down
2 changes: 1 addition & 1 deletion cms/__init__.py
@@ -1,4 +1,4 @@
__version__ = '3.11.2'
__version__ = '3.11.3'

try:
import django
Expand Down
3 changes: 3 additions & 0 deletions cms/static/cms/css/3.11.3/cms.base.css

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions cms/static/cms/css/3.11.3/cms.pagetree.css

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions cms/static/cms/css/3.11.3/cms.welcome.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions cms/static/cms/css/3.11.3/cms.wizard.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.