8000 ci: Update develop with 3.11.1 release by fsbraun · Pull Request #7469 · django-cms/django-cms · GitHub
[go: up one dir, main page]

Skip to content

ci: Update develop with 3.11.1 release #7469

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 68 commits into from
Jan 5, 2023
Merged
Changes from 1 commit
Commits
Show all changes
68 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
979d42c
build: bump minimatch from 3.0.4 to 3.1.2 (#7453)
dependabot[bot] Dec 24, 2022
2ea05d4
build: bump decode-uri-component from 0.2.0 to 0.2.2 (#7451)
dependabot[bot] Dec 27, 2022
0edd6a2
Merge branch 'develop' into update-develop
fsbraun Jan 5, 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: typos in CHANGELOG.rst
  • Loading branch information
marksweb committed May 24, 2022
commit ea18ce1a5d0e8c8afeb4e931c8a71fa8e659b6cd
14 changes: 7 additions & 7 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ Bug Fixes:
* Fix styles issues, caused by switching to the ``display: flex`` on the page tree renderer.
* Fixed missing builtin arguments on main ``cms`` management command causing it to crash
* Fixed template label nested translation
* Fixed a bug where the fallback page title whould be returned instead of the one from the current language
* Fixed a bug where the fallback page title would be returned instead of the one from the current language
* Fixed an issue when running migrations on a multi database project
* Fixes #7033: also check for Django 3.2, now that 3.9 supports it. (#7054) (02083f2dc) -- Marco Bonetti

Expand Down Expand Up @@ -222,7 +222,7 @@ Thanks to all contributors for their efforts!
* Fixed an issue in ``wizards/create.html`` where the error message did not use the plural form
* Improved documentation building
* Updated the content for django CMS’s development community
* Replaced all occurences of ``force_text`` and ``smart_text`` against
* Replaced all occurrences of ``force_text`` and ``smart_text`` against
``force_str``and ``smart_str``.


Expand Down Expand Up @@ -760,7 +760,7 @@ Thanks to all contributors for their efforts!
- Substantial improvements to the page tree and significant reduction of reloads
- Update jsTree version to 3.2.1 with slight adaptions to the Pagetree
- Documentation improvements
- Improve the display and useability of the language menu, especially in cases
- Improve the display and usability of the language menu, especially in cases
where there are many languages.
- Fix an issue relating to search fields in plugins
- Fix an issue where the app-resolver would trigger locales into migrations
Expand Down Expand Up @@ -1074,7 +1074,7 @@ Thanks to all contributors for their efforts!
- Improves redirection as a result of changes to page slugs, etc.
- Improves performance of "watched models"
- Improves frontend performance relating to resizing the sideframe
- Corrects an issue where items might not be visible in structue mode menus
- Corrects an issue where items might not be visible in structure mode menus
- Limits version of django-mptt used in CMS for 3.0.x
- Prevent accidental upgrades to Django 1.8, which is not yet supported

Expand Down Expand Up @@ -1131,7 +1131,7 @@ Thanks to all contributors for their efforts!
==================

- Add require_parent option to CMS_PLACEHOLDER_CONF
912E - Fix django-mptt version depenency to be PEP440 compatible
- Fix django-mptt version dependency to be PEP440 compatible
- Fix some Django 1.4 compatibility issues
- Add toolbar sanity check
- Fix behavior with CMSPluginBase.get_render_template()
Expand Down Expand Up @@ -1159,7 +1159,7 @@ Thanks to all contributors for their efforts!
- Fixes PageField to work in Django 1.7 environments
- Updates to community and project governance documentation
- Added list of retired core developers
- Added branch policy documentaion
- Added branch policy documentation


3.0.6 (2014-10-07)
Expand Down Expand Up @@ -1369,7 +1369,7 @@ Please see Install/2.4 release notes *before* attempting to upgrade to version 2
- CMS_FRONTEND_LANGUAGES limits django languages as well during language selection
- Wymeditor updated to 1.0.4a
- icon_url escape fixed
- Ukranian translation added
- Ukrainian translation added
- Fixed wrong language prefix handling for form actions and admin preview
- Admin icons in django 1.4 fixed
- Added requirements.txt for pip and testing in test_requirements
Expand Down
0