-
-
Notifications
You must be signed in to change notification settings - Fork 3.2k
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
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* [3.10.0rc1 release process] Bumped version to 3.10.0rc1 * [3.10.0rc1 release process] compilemessages * [3.10.0rc1 release process] compiling new static files * [3.10.0rc1 release process] updating latest docs
* Fix script typos (#7201) * [refactor] Typos in release scripts * This was correct. Co-authored-by: Simon Krull <simondotunix@gmail.com> * feat: Added concurrency option to github workflows (#7205) * fix: Disable workflow concurrency to bring stability back to the CI (#7209) * Upgrade Gulp and Nodejs (#7208) * feat: upgrade sass and gulp sass so that it installs on a modern node.js * fix: upgrade some packages and gulp config to 4.x series * fix: add support for icons working as well * Feat: get some tasks to work * fix: port one more tasks even if it is still erroring * wip: still broken config for webpack bundle * fix: let the new tests run * fix: issue with lint task * fix: some more issues with loaders * feat: get some tests passing atleast * fix: the frontend tests pass now * feat: generate new lock file * feat: use gulp 4.x * feat: make build use node16 as well * feat: add .nvmrc for a consistent experience * feat: Run workflows in concurrency groups (#7211) * feat: Added concurrency config using unique workflow groups * Remove whitespace to test cancellation * Remove whitespace to test cancellation 2 Co-authored-by: Vinit Kumar <mail@vinitkumar.me> Co-authored-by: Simon Krull <simondotunix@gmail.com>
* Fix script typos (#7201) * [refactor] Typos in release scripts * This was correct. Co-authored-by: Simon Krull <simondotunix@gmail.com> * feat: Added concurrency option to github workflows (#7205) * fix: Disable workflow concurrency to bring stability back to the CI (#7209) * Upgrade Gulp and Nodejs (#7208) * feat: upgrade sass and gulp sass so that it installs on a modern node.js * fix: upgrade some packages and gulp config to 4.x series * fix: add support for icons working as well * Feat: get some tasks to work * fix: port one more tasks even if it is still erroring * wip: still broken config for webpack bundle * fix: let the new tests run * fix: issue with lint task * fix: some more issues with loaders * feat: get some tests passing atleast * fix: the frontend tests pass now * feat: generate new lock file * feat: use gulp 4.x * feat: make build use node16 as well * feat: add .nvmrc for a consistent experience * feat: Run workflows in concurrency groups (#7211) * feat: Added concurrency config using unique workflow groups * Remove whitespace to test cancellation * Remove whitespace to test cancellation 2 Co-authored-by: Vinit Kumar <mail@vinitkumar.me> * fix: Toolbar bug in 3.10 (#7232) Co-authored-by: fsbraun <fsbraun@gmx.de> Co-authored-by: Mark Walker <theshow@gmail.com> Co-authored-by: Simon Krull <simondotunix@gmail.com> Co-authored-by: fsbraun <fsbraun@gmx.de>
<
10000
a title="Release/3.10.x (#7260) Releasing 3.10.0RC2
* [3.10.0rc2 release process] Bumped version to 3.10.0rc2
* [3.10.0rc2 release process] compilemessages
* [3.10.0rc2 release process] compiling new static files
* [3.10.0rc2 release process] updating latest docs" data-pjax="true" class="Link--secondary markdown-title" href="/django-cms/django-cms/pull/7469/commits/822fbab1920d7282d142841afcf12577f8246e7a">Release/3.10.x (#7260) Releasing 3.10.0RC2
* [3.10.0rc2 release process] Bumped version to 3.10.0rc2 * [3.10.0rc2 release process] compilemessages * [3.10.0rc2 release process] compiling new static files * [3.10.0rc2 release process] updating latest docs
* Update release script to make it compatible with BSD (macos) compatible * Fix version number in bump commit
* [3.11.0 release process] Bumped version to 3.11.0 * [3.11.0 release process] compilemessages * [3.11.0 release process] compiling new static files * [3.11.0 release process] updating latest docs * [3.11.0rc1 release process] Bumped version to 3.11.0rc1 * Added static files * Removed static files of 0.3.11 release * Manually added changes to the upgrade docs * Adjusted upgrade note header
# Conflicts: # .github/workflows/frontend.yml # CHANGELOG.rst # docs/upgrade/3.10.0.rst # package-lock.json # package.json
* Release 3.10.0 RC1 (#7215) * [3.10.0rc1 release process] Bumped version to 3.10.0rc1 * [3.10.0rc1 release process] compilemessages * [3.10.0rc1 release process] compiling new static files * [3.10.0rc1 release process] updating latest docs * Update release/3.10 from develop (#7219) * Fix script typos (#7201) * [refactor] Typos in release scripts * This was correct. Co-authored-by: Simon Krull <simondotunix@gmail.com> * feat: Added concurrency option to github workflows (#7205) * fix: Disable workflow concurrency to bring stability back to the CI (#7209) * Upgrade Gulp and Nodejs (#7208) * feat: upgrade sass and gulp sass so that it installs on a modern node.js * fix: upgrade some packages and gulp config to 4.x series * fix: add support for icons working as well * Feat: get some tasks to work * fix: port one more tasks even if it is still erroring * wip: still broken config for webpack bundle * fix: let the new tests run * fix: issue with lint task * fix: some more issues with loaders * feat: get some tests passing atleast * fix: the frontend tests pass now * feat: generate new lock file * feat: use gulp 4.x * feat: make build use node16 as well * feat: add .nvmrc for a consistent experience * feat: Run workflows in concurrency groups (#7211) * feat: Added concurrency config using unique workflow groups * Remove whitespace to test cancellation * Remove whitespace to test cancellation 2 Co-authored-by: Vinit Kumar <mail@vinitkumar.me> Co-authored-by: Simon Krull <simondotunix@gmail.com> * Add toolbar fix for broken CMS in the release 3.10.x (#7233) * Fix script typos (#7201) * [refactor] Typos in release scripts * This was correct. Co-authored-by: Simon Krull <simondotunix@gmail.com> * feat: Added concurrency option to github workflows (#7205) * fix: Disable workflow concurrency to bring stability back to the CI (#7209) * Upgrade Gulp and Nodejs (#7208) * feat: upgrade sass and gulp sass so that it installs on a modern node.js * fix: upgrade some packages and gulp config to 4.x series * fix: add support for icons working as well * Feat: get some tasks to work * fix: port one more tasks even if it is still erroring * wip: still broken config for webpack bundle * fix: let the new tests run * fix: issue with lint task * fix: some more issues with loaders * feat: get some tests passing atleast * fix: the frontend tests pass now * feat: generate new lock file * feat: use gulp 4.x * feat: make build use node16 as well * feat: add .nvmrc for a consistent experience * feat: Run workflows in concurrency groups (#7211) * feat: Added concurrency config using unique workflow groups * Remove whitespace to test cancellation * Remove whitespace to test cancellation 2 Co-authored-by: Vinit Kumar <mail@vinitkumar.me> * fix: Toolbar bug in 3.10 (#7232) Co-authored-by: fsbraun <fsbraun@gmx.de> Co-authored-by: Mark Walker <theshow@gmail.com> Co-authored-by: Simon Krull <simondotunix@gmail.com> Co-authored-by: fsbraun <fsbraun@gmx.de> * fix: using .nvmrc to target teh right nvm version * Release/3.10.x (#7260) Releasing 3.10.0RC2 * [3.10.0rc2 release process] Bumped version to 3.10.0rc2 * [3.10.0rc2 release process] compilemessages * [3.10.0rc2 release process] compiling new static files * [3.10.0rc2 release process] updating latest docs * Update release script to make it compatible with BSD (macos) compatible * Update release script to make it compatible with BSD (macos) compatible * Release/3.10.x (#7275) * Fixes #7288 by also catching AttributeError, when the current toolbar… (#7289) * Fixes #7288 by also catching AttributeError, when the current toolbar object doesn't define get_draft_url() * #7288: also catch AttributeError when `get_absolute_url()` isn't defined. * Fix for django 2.2 in middleware [#7290] (#7293) * Fix for django 2.2 in middleware [#7290] * Address isort concern * Update release script to make it compatible with BSD (macos) compatible * Update release script to make it compatible with BSD (macos) compatible (#7294) * Fix version number in bump commit * Fix release script version commit. (#7295) * Update release script to make it compatible with BSD (macos) compatible * Fix version number in bump commit * fix: typos in CHANGELOG.rst * ci: Sync release/3.10.x with develop (#7328) * Release 3.10.0 RC1 (#7215) * [3.10.0rc1 release process] Bumped version to 3.10.0rc1 * [3.10.0rc1 release process] compilemessages * [3.10.0rc1 release process] compiling new static files * [3.10.0rc1 release process] updating latest docs * Update release/3.10 from develop (#7219) * Fix script typos (#7201) * [refactor] Typos in release scripts * This was correct. Co-authored-by: Simon Krull <simondotunix@gmail.com> * feat: Added concurrency option to github workflows (#7205) * fix: Disable workflow concurrency to bring stability back to the CI (#7209) * Upgrade Gulp and Nodejs (#7208) * feat: upgrade sass and gulp sass so that it installs on a modern node.js * fix: upgrade some packages and gulp config to 4.x series * fix: add support for icons working as well * Feat: get some tasks to work * fix: port one more tasks even if it is still erroring * wip: still broken config for webpack bundle * fix: let the new tests run * fix: issue with lint task * fix: some more issues with loaders * feat: get some tests passing atleast * fix: the frontend tests pass now * feat: generate new lock file * feat: use gulp 4.x * feat: make build use node16 as well * feat: add .nvmrc for a consistent experience * feat: Run workflows in concurrency groups (#7211) * feat: Added concurrency config using unique workflow groups * Remove whitespace to test cancellation * Remove whitespace to test cancellation 2 Co-authored-by: Vinit Kumar <mail@vinitkumar.me> Co-authored-by: Simon Krull <simondotunix@gmail.com> * Add toolbar fix for broken CMS in the release 3.10.x (#7233) * Fix script typos (#7201) * [refactor] Typos in release scripts * This was correct. Co-authored-by: Simon Krull <simondotunix@gmail.com> * feat: Added concurrency option to github workflows (#7205) * fix: Disable workflow concurrency to bring stability back to the CI (#7209) * Upgrade Gulp and Nodejs (#7208) * feat: upgrade sass and gulp sass so that it installs on a modern node.js * fix: upgrade some packages and gulp config to 4.x series * fix: add support for icons working as well * Feat: get some tasks to work * fix: port one more tasks even if it is still erroring * wip: still broken config for webpack bundle * fix: let the new tests run * fix: issue with lint task * fix: some more issues with loaders * feat: get some tests passing atleast * fix: the frontend tests pass now * feat: generate new lock file * feat: use gulp 4.x * feat: make build use node16 as well * feat: add .nvmrc for a consistent experience * feat: Run workflows in concurrency groups (#7211) * feat: Added concurrency config using unique workflow groups * Remove whitespace to test cancellation * Remove whitespace to test cancellation 2 Co-authored-by: Vinit Kumar <mail@vinitkumar.me> * fix: Toolbar bug in 3.10 (#7232) Co-authored-by: fsbraun <fsbraun@gmx.de> Co-authored-by: Mark Walker <theshow@gmail.com> Co-authored-by: Simon Krull <simondotunix@gmail.com> Co-authored-by: fsbraun <fsbraun@gmx.de> * fix: using .nvmrc to target teh right nvm version * Release/3.10.x (#7260) Releasing 3.10.0RC2 * [3.10.0rc2 release process] Bumped version to 3.10.0rc2 * [3.10.0rc2 release process] compilemessages * [3.10.0rc2 release process] compiling new static files * [3.10.0rc2 release process] updating latest docs * Update release script to make it compatible with BSD (macos) compatible * Update release script to make it compatible with BSD (macos) compatible * Release/3.10.x (#7275) * Fixes #7288 by also catching AttributeError, when the current toolbar… (#7289) * Fixes #7288 by also catching AttributeError, when the current toolbar object doesn't define get_draft_url() * #7288: also catch AttributeError when `get_absolute_url()` isn't defined. * Fix for django 2.2 in middleware [#7290] (#7293) * Fix for django 2.2 in middleware [#7290] * Address isort concern * Update release script to make it compatible with BSD (macos) compatible (#7294) * Fix release script version commit. (#7295) * Update release script to make it compatible with BSD (macos) compatible * Fix version number in bump commit * fix: typos in CHANGELOG.rst Co-authored-by: Florian Delizy <fdelizy@logitech.com> Co-authored-by: Vinit Kumar <mail@vinitkumar.me> Co-authored-by: Simon Krull <simondotunix@gmail.com> Co-authored-by: fsbraun <fsbraun@gmx.de> Co-authored-by: Marco Bonetti <mbonetti@gmail.com> * build: release 3.10.1rc1 (#7330) * fix: Use http rather than https in toolbar sites menu (#7331) * fix: Use http rather than https in toolbar sites menu (#7331) * fix: Revert change to the toolbar sites menu to use ``http`` protocol (#7332) * Fix for "Permission denied (publickey)" error (#7333) Using https fixes the issue with running the `git clone` command resulting in the error: >git@github.com: Permission denied (publickey). >fatal: Could not read from remote repository. > >Please make sure you have the correct access rights >and the repository exists. * feat: Configurable dark mode (#7329) * Feat: Dark mode support, including 67ED input from @marksweb, bugfix for tooltips * Add: Color scheme configurable * Add: Toolbar toggle (always on) * Add: CMS_COLOR_SCHEME_TOGGLE setting * Add: color scheme toggle test * Fix: Only set color scheme in cms iframes * Add: Basic documentation of new settings * Fix: color scheme switch as css variables * Fix: Cascade settings into iframes of iframes (e.g., cms plugins inside ckeditor) * Fix: no toggle in collapsed toolbar Co-authored-by: Vinit Kumar <mail@vinitkumar.me> Co-authored-by: Simon Krull <krull@punkt.de> Co-authored-by: Vinit Kumar <vinit.kumar@kidskonnect.nl> * fix: dark mode tweaks and test fixes (requests in context) (#7338) * Fix: toolbar bug 3.10.rc1 * Feat: Dark mode support, including input from @marksweb, bugfix for tooltips * Upstream change to be able to merge * Feat: Dark mode support, including input from @marksweb, bugfix for tooltips * Revert "Fix: toolbar bug 3.10.rc1" This reverts commit 592a2b6. * Fix: Recommit toolbar fix (??) * Fix: After lint failure: Remove spaces added by PyCharm * Fix: Wizzard button color * Fix: Correct toolbar according to cms_path Fix: Avoid unnecessary toolbar loading * TASK: use isort to sort imports * Fix: Remove unused css rule Fix: Add plugin search bar text did not reflect dark mode * Fix: Toolbar tests to include request object for TextPlugin * Fix: Pass a request (None) for the processors test Co-authored-by: Vinit Kumar <mail@vinitkumar.me> Co-authored-by: Simon Krull <krull@punkt.de> Co-authored-by: Mark Walker <theshow@gmail.com> * fix: remove fixed width for edit plugin popup (=> autowidth) (#7337) * fix: remove fixed width for edit plugin popup (=> autowidth) Same behavior as new popup * fix: revert bundled js * fix: update changelog * fix: remove trailing comma * fix: Except block using list instead of tuple (#7342) * Release 3.10.0 RC1 (#7215) * [3.10.0rc1 release process] Bumped version to 3.10.0rc1 * [3.10.0rc1 release process] compilemessages * [3.10.0rc1 release process] compiling new static files * [3.10.0rc1 release process] updating latest docs * Update release/3.10 from develop (#7219) * Fix script typos (#7201) * [refactor] Typos in release scripts * This was correct. Co-authored-by: Simon Krull <simondotunix@gmail.com> * feat: Added concurrency option to github workflows (#7205) * fix: Disable workflow concurrency to bring stability back to the CI (#7209) * Upgrade Gulp and Nodejs (#7208) * feat: upgrade sass and gulp sass so that it installs on a modern node.js * fix: upgrade some packages and gulp config to 4.x series * fix: add support for icons working as well * Feat: get some tasks to work * fix: port one more tasks even if it is still erroring * wip: still broken config for webpack bundle * fix: let the new tests run * fix: issue with lint task * fix: some more issues with loaders * feat: get some tests passing atleast * fix: the frontend tests pass now * feat: generate new lock file * feat: use gulp 4.x * feat: make build use node16 as well * feat: add .nvmrc for a consistent experience * feat: Run workflows in concurrency groups (#7211) * feat: Added concurrency config using unique workflow groups * Remove whitespace to test cancellation * Remove whitespace to test cancellation 2 Co-authored-by: Vinit Kumar <mail@vinitkumar.me> Co-authored-by: Simon Krull <simondotunix@gmail.com> * Add toolbar fix for broken CMS in the release 3.10.x (#7233) * Fix script typos (#7201) * [refactor] Typos in release scripts * This was correct. Co-authored-by: Simon Krull <simondotunix@gmail.com> * feat: Added concurrency option to github workflows (#7205) * fix: Disable workflow concurrency to bring stability back to the CI (#7209) * Upgrade Gulp and Nodejs (#7208) * feat: upgrade sass and gulp sass so that it installs on a modern node.js * fix: upgrade some packages and gulp config to 4.x series * fix: add support for icons working as well * Feat: get some tasks to work * fix: port one more tasks even if it is still erroring * wip: still broken config for webpack bundle * fix: let the new tests run * fix: issue with lint task * fix: some more issues with loaders * feat: get some tests passing atleast * fix: the frontend tests pass now * feat: generate new lock file * feat: use gulp 4.x * feat: make build use node16 as well * feat: add .nvmrc for a consistent experience * feat: Run workflows in concurrency groups (#7211) * feat: Added concurrency config using unique workflow groups * Remove whitespace to test cancellation * Remove whitespace to test cancellation 2 Co-authored-by: Vinit Kumar <mail@vinitkumar.me> * fix: Toolbar bug in 3.10 (#7232) Co-authored-by: fsbraun <fsbraun@gmx.de> Co-authored-by: Mark Walker <theshow@gmail.com> Co-authored-by: Simon Krull <simondotunix@gmail.com> Co-authored-by: fsbraun <fsbraun@gmx.de> * fix: using .nvmrc to target teh right nvm version * Release/3.10.x (#7260) Releasing 3.10.0RC2 * [3.10.0rc2 release process] Bumped version to 3.10.0rc2 * [3.10.0rc2 release process] compilemessages * [3.10.0rc2 release process] compiling new static files * [3.10.0rc2 release process] updating latest docs * Update release script to make it compatible with BSD (macos) compatible * Update release script to make it compatible with BSD (macos) compatible * Release/3.10.x (#7275) * Fixes #7288 by also catching AttributeError, when the current toolbar… (#7289) * Fixes #7288 by also catching AttributeError, when the current toolbar object doesn't define get_draft_url() * #7288: also catch AttributeError when `get_absolute_url()` isn't defined. * Fix for django 2.2 in middleware [#7290] (#7293) * Fix for django 2.2 in middleware [#7290] * Address isort concern * Update release script to make it compatible with BSD (macos) compatible (#7294) * Fix release script version commit. (#7295) * Update release script to make it compatible with BSD (macos) compatible * Fix version number in bump commit * fix: typos in CHANGELOG.rst * fix: Change except catch using list to tuple [#7334] * fix: typo in changelog Co-authored-by: Florian Delizy <fdelizy@logitech.com> Co-authored-by: Vinit Kumar <mail@vinitkumar.me> Co-authored-by: Simon Krull <simondotunix@gmail.com> Co-authored-by: fsbraun <fsbraun@gmx.de> Co-authored-by: Marco Bonetti <mbonetti@gmail.com> * feat: add cache ttl extension point (#7299) Adds the setting `CMS_CACHE_LIMIT_TTL_CLASS` that should have a `limit_page_cache_ttl` method that would be called to limit the cache ttl of a page using business logic. Closes #7296 * fix: Rename changelog title to fix release script * fix: Changelog title for 3.10.1rc1 (#7345) * fix: Request missing from test rendering (#7346) * fix: Changelog titles for 3.10.x (#7347) * build: Release 3.10.1 (#7348) Co-authored-by: Florian Delizy <fdelizy@logitech.com> Co-authored-by: Vinit Kumar <mail@vinitkumar.me> Co-authored-by: Simon Krull <simondotunix@gmail.com> Co-authored-by: fsbraun <fsbraun@gmx.de> Co-authored-by: Marco Bonetti <mbonetti@gmail.com> Co-authored-by: Conrad <grosserconrad@gmail.com> Co-authored-by: jillalberts <81445981+jillalberts@users.noreply.github.com> Co-authored-by: Simon Krull <krull@punkt.de> Co-authored-by: Fabien MICHEL <fabien.michel@hespul.org> Co-authored-by: Ivo Branco <igobranco@gmail.com>
Co-authored-by: Patrick Mazulo <pmazulo@gmail.com>
Co-authored-by: Patrick Mazulo <pmazulo@gmail.com>
Co-authored-by: Patrick Mazulo <pmazulo@gmail.com>
Co-authored-by: Patrick Mazulo <pmazulo@gmail.com>
Co-authored-by: Patrick Mazulo <pmazulo@gmail.com>
* Release 3.10.0 RC1 (#7215) * [3.10.0rc1 release process] Bumped version to 3.10.0rc1 * [3.10.0rc1 release process] compilemessages * [3.10.0rc1 release process] compiling new static files * [3.10.0rc1 release process] updating latest docs * Update release/3.10 from develop (#7219) * Fix script typos (#7201) * [refactor] Typos in release scripts * This was correct. Co-authored-by: Simon Krull <simondotunix@gmail.com> * feat: Added concurrency option to github workflows (#7205) * fix: Disable workflow concurrency to bring stability back to the CI (#7209) * Upgrade Gulp and Nodejs (#7208) * feat: upgrade sass and gulp sass so that it installs on a modern node.js * fix: upgrade some packages and gulp config to 4.x series * fix: add support for icons working as well * Feat: get some tasks to work * fix: port one more tasks even if it is still erroring * wip: still broken config for webpack bundle * fix: let the new tests run * fix: issue with lint task * fix: some more issues with loaders * feat: get some tests passing atleast * fix: the frontend tests pass now * feat: generate new lock file * feat: use gulp 4.x * feat: make build use node16 as well * feat: add .nvmrc for a consistent experience * feat: Run workflows in concurrency groups (#7211) * feat: Added concurrency config using unique workflow groups * Remove whitespace to test cancellation * Remove whitespace to test cancellation 2 Co-authored-by: Vinit Kumar <mail@vinitkumar.me> Co-authored-by: Simon Krull <simondotunix@gmail.com> * Add toolbar fix for broken CMS in the release 3.10.x (#7233) * Fix script typos (#7201) * [refactor] Typos in release scripts * This was correct. Co-authored-by: Simon Krull <simondotunix@gmail.com> * feat: Added concurrency option to github workflows (#7205) * fix: Disable workflow concurrency to bring stability back to the CI (#7209) * Upgrade Gulp and Nodejs (#7208) * feat: upgrade sass and gulp sass so that it installs on a modern node.js * fix: upgrade some packages and gulp config to 4.x series * fix: add support for icons working as well * Feat: get some tasks to work * fix: port one more tasks even if it is still erroring * wip: still broken config for webpack bundle * fix: let the new tests run * fix: issue with lint task * fix: some more issues with loaders * feat: get some tests passing atleast * fix: the frontend tests pass now * feat: generate new lock file * feat: use gulp 4.x * feat: make build use node16 as well * feat: add .nvmrc for a consistent experience * feat: Run workflows in concurrency groups (#7211) * feat: Added concurrency config using unique workflow groups * Remove whitespace to test cancellation * Remove whitespace to test cancellation 2 Co-authored-by: Vinit Kumar <mail@vinitkumar.me> * fix: Toolbar bug in 3.10 (#7232) Co-authored-by: fsbraun <fsbraun@gmx.de> Co-authored-by: Mark Walker <theshow@gmail.com> Co-authored-by: Simon Krull <simondotunix@gmail.com> Co-authored-by: fsbraun <fsbraun@gmx.de> * fix: using .nvmrc to target teh right nvm version * Release/3.10.x (#7260) Releasing 3.10.0RC2 * [3.10.0rc2 release process] Bumped version to 3.10.0rc2 * [3.10.0rc2 release process] compilemessages * [3.10.0rc2 release process] compiling new static files * [3.10.0rc2 release process] updating latest docs * Update release script to make it compatible with BSD (macos) compatible * Update release script to make it compatible with BSD (macos) compatible * Release/3.10.x (#7275) * Fixes #7288 by also catching AttributeError, when the current toolbar… (#7289) * Fixes #7288 by also catching AttributeError, when the current toolbar object doesn't define get_draft_url() * #7288: also catch AttributeError when `get_absolute_url()` isn't defined. * Fix for django 2.2 in middleware [#7290] (#7293) * Fix for django 2.2 in middleware [#7290] * Address isort concern * Update release script to make it compatible with BSD (macos) compatible * Update release script to make it compatible with BSD (macos) compatible (#7294) * Fix version number in bump commit * Fix release script version commit. (#7295) * Update release script to make it compatible with BSD (macos) compatible * Fix version number in bump commit * fix: typos in CHANGELOG.rst * build: release 3.10.1rc1 (#7330) * fix: Use http rather than https in toolbar sites menu (#7331) * fix: Revert change to the toolbar sites menu to use ``http`` protocol (#7332) * fix: Rename changelog title to fix release script * fix: Changelog title for 3.10.1rc1 (#7345) * fix: Request missing from test rendering (#7346) * fix: Changelog titles for 3.10.x (#7347) * build: Release 3.10.1 (#7348) * Update CHANGELOG.rst Co-authored-by: Patrick Mazulo <pmazulo@gmail.com> * Update CHANGELOG.rst Co-authored-by: Patrick Mazulo <pmazulo@gmail.com> * Update CHANGELOG.rst Co-authored-by: Patrick Mazulo <pmazulo@gmail.com> * Update CHANGELOG.rst Co-authored-by: Patrick Mazulo <pmazulo@gmail.com> * Update docs/upgrade/3.10.1.rst Co-authored-by: Patrick Mazulo <pmazulo@gmail.com> * ci: Flake8 fixes * Addressing review comment [#7372] Co-authored-by: Florian Delizy <fdelizy@logitech.com> Co-authored-by: Vinit Kumar <mail@vinitkumar.me> Co-authored-by: Simon Krull <simondotunix@gmail.com> Co-authored-by: fsbraun <fsbraun@gmx.de> Co-authored-by: Marco Bonetti <mbonetti@gmail.com> Co-authored-by: Conrad <grosserconrad@gmail.com> Co-authored-by: Patrick Mazulo <pmazulo@gmail.com> (cherry picked from commit 3b2dc10)
Remove bug in `python manage.py command`
* ci: stale bot added (#7298) * ci: Added codespell (#7355) Co-authored-by: Christian Clauss <cclauss@me.com> * ci: codespell config taken from #7292 * fix: Added language to page cache key (#7354) * ci: Remove a superfluous installation of codespell (#7356) * build: bump django from 3.2.13 to 3.2.14 in /docs (#7358) Bumps [django](https://github.com/django/django) from 3.2.13 to 3.2.14. - [Release notes](https://github.com/django/django/releases) - [Commits](django/django@3.2.13...3.2.14) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * typo (#7360) * Update install.rst (#7368) Remove bug in `python manage.py command` * ci: Flake8 fixes (#7372) * Release 3.10.0 RC1 (#7215) * [3.10.0rc1 release process] Bumped version to 3.10.0rc1 * [3.10.0rc1 release process] compilemessages * [3.10.0rc1 release process] compiling new static files * [3.10.0rc1 release process] updating latest docs * Update release/3.10 from develop (#7219) * Fix script typos (#7201) * [refactor] Typos in release scripts * This was correct. Co-authored-by: Simon Krull <simondotunix@gmail.com> * feat: Added concurrency option to github workflows (#7205) * fix: Disable workflow concurrency to bring stability back to the CI (#7209) * Upgrade Gulp and Nodejs (#7208) * feat: upgrade sass and gulp sass so that it installs on a modern node.js * fix: upgrade some packages and gulp config to 4.x series * fix: add support for icons working as well * Feat: get some tasks to work * fix: port one more tasks even if it is still erroring * wip: still broken config for webpack bundle * fix: let the new tests run * fix: issue with lint task * fix: some more issues with loaders * feat: get some tests passing atleast * fix: the frontend tests pass now * feat: generate new lock file * feat: use gulp 4.x * feat: make build use node16 as well * feat: add .nvmrc for a consistent experience * feat: Run workflows in concurrency groups (#7211) * feat: Added concurrency config using unique workflow groups * Remove whitespace to test cancellation * Remove whitespace to test cancellation 2 Co-authored-by: Vinit Kumar <mail@vinitkumar.me> Co-authored-by: Simon Krull <simondotunix@gmail.com> * Add toolbar fix for broken CMS in the release 3.10.x (#7233) * Fix script typos (#7201) * [refactor] Typos in release scripts * This was correct. Co-authored-by: Simon Krull <simondotunix@gmail.com> * feat: Added concurrency option to github workflows (#7205) * fix: Disable workflow concurrency to bring stability back to the CI (#7209) * Upgrade Gulp and Nodejs (#7208) * feat: upgrade sass and gulp sass so that it installs on a modern node.js * fix: upgrade some packages and gulp config to 4.x series * fix: add support for icons working as well * Feat: get some tasks to work * fix: port one more tasks even if it is still erroring * wip: still broken config for webpack bundle * fix: let the new tests run * fix: issue with lint task * fix: some more issues with loaders * feat: get some tests passing atleast * fix: the frontend tests pass now * feat: generate new lock file * feat: use gulp 4.x * feat: make build use node16 as well * feat: add .nvmrc for a consistent experience * feat: Run workflows in concurrency groups (#7211) * feat: Added concurrency config using unique workflow groups * Remove whitespace to test cancellation * Remove whitespace to test cancellation 2 Co-authored-by: Vinit Kumar <mail@vinitkumar.me> * fix: Toolbar bug in 3.10 (#7232) Co-authored-by: fsbraun <fsbraun@gmx.de> Co-authored-by: Mark Walker <theshow@gmail.com> Co-authored-by: Simon Krull <simondotunix@gmail.com> Co-authored-by: fsbraun <fsbraun@gmx.de> * fix: using .nvmrc to target teh right nvm version * Release/3.10.x (#7260) Releasing 3.10.0RC2 * [3.10.0rc2 release process] Bumped version to 3.10.0rc2 * [3.10.0rc2 release process] compilemessages * [3.10.0rc2 release process] compiling new static files * [3.10.0rc2 release process] updating latest docs * Update release script to make it compatible with BSD (macos) compatible * Update release script to make it compatible with BSD (macos) compatible * Release/3.10.x (#7275) * Fixes #7288 by also catching AttributeError, when the current toolbar… (#7289) * Fixes #7288 by also catching AttributeError, when the current toolbar object doesn't define get_draft_url() * #7288: also catch AttributeError when `get_absolute_url()` isn't defined. * Fix for django 2.2 in middleware [#7290] (#7293) * Fix for django 2.2 in middleware [#7290] * Address isort concern * Update release script to make it compatible with BSD (macos) compatible * Update release script to make it compatible with BSD (macos) compatible (#7294) * Fix version number in bump commit * Fix release script version commit. (#7295) * Update release script to make it compatible with BSD (macos) compatible * Fix version number in bump commit * fix: typos in CHANGELOG.rst * build: release 3.10.1rc1 (#7330) * fix: Use http rather than https in toolbar sites menu (#7331) * fix: Revert change to the toolbar sites menu to use ``http`` protocol (#7332) * fix: Rename changelog title to fix release script * fix: Changelog title for 3.10.1rc1 (#7345) * fix: Request missing from test rendering (#7346) * fix: Changelog titles for 3.10.x (#7347) * build: Release 3.10.1 (#7348) * Update CHANGELOG.rst Co-authored-by: Patrick Mazulo <pmazulo@gmail.com> * Update CHANGELOG.rst Co-authored-by: Patrick Mazulo <pmazulo@gmail.com> * Update CHANGELOG.rst Co-authored-by: Patrick Mazulo <pmazulo@gmail.com> * Update CHANGELOG.rst Co-authored-by: Patrick Mazulo <pmazulo@gmail.com> * Update docs/upgrade/3.10.1.rst Co-authored-by: Patrick Mazulo <pmazulo@gmail.com> * ci: Flake8 fixes * Addressing review comment [#7372] Co-authored-by: Florian Delizy <fdelizy@logitech.com> Co-authored-by: Vinit Kumar <mail@vinitkumar.me> Co-authored-by: Simon Krull <simondotunix@gmail.com> Co-authored-by: fsbraun <fsbraun@gmx.de> Co-authored-by: Marco Bonetti <mbonetti@gmail.com> Co-authored-by: Conrad <grosserconrad@gmail.com> Co-authored-by: Patrick Mazulo <pmazulo@gmail.com> * build: bump django from 3.2.14 to 3.2.15 in /docs (#7379) Bumps [django](https://github.com/django/django) from 3.2.14 to 3.2.15. - [Release notes](https://github.com/django/django/releases) - [Commits](django/django@3.2.14...3.2.15) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix: default light mode (#7381) * ci: Merging release/3.11.0 (#7377) * docs: Bump requirements (#7382) * docs: Bump requirements * docs: Bump python verion used by RTD * docs: Have RTD install from setup.py * chore: Fix spelling errors * docs: build against python 3.8 * docs: try to install from `setup.py` using conf file * docs: Install from pip then setup * ci: Install django-cms from pip again * fix: CMS check management command fixed [#7386] * ci: sync isort line length (#7353) * docs: fixing a link (#7393) * docs: fixing a link misspelled URL * Update CONTRIBUTING.rst Co-authored-by: Mark Walker <theshow@gmail.com> Co-authored-by: Mark Walker <theshow@gmail.com> * refactor: Move js API functions to CMS.Helpers to make them available also to the admin site (#7384) Move CMS.API.Toolbar.get_color_scheme to CMS.API.Helpers.getColorScheme and CMS.API.Toolbar.set_color_scheme to CMS.API.Helpers.setColorScheme * fix: Allow partially overriding CMS_CACHE_DURATIONS (#7339) * Allow partially overriding CMS_CACHE_DURATIONS * add doc and changelog Co-authored-by: Fabian Braun <fsbraun@gmx.de> * Adjust paste label in pt-br locale (#7376) * feat: Add support for tel: and mailto: URIs in Advanced Page Settings redirect field (#7370) Co-authored-by: Patrick Mazulo <pmazulo@gmail.com> * feat: Add support for tel: and mailto: URIs in Advanced Page Settings redirect field * docs: Correction of headings around CMSPlugin & CMSPluginBase (#7406) * fix: Unlocalize page and node ids when rendering the page tree in the admin (#7188) * #7175: unlocalize page and node ids when rendering the page tree in the admin * Fix flake8 issue * Update the test so as not to have to generate one thousand pages. The downside is that it only works in sqlite * Make isort happy * #7155: extend unlocalisation of pks to a few more templates * #7175: cleanup, dont unlocalize in `if` tags * Update CHANGELOG about #7175 Co-authored-by: Fabian Braun <fsbraun@gmx.de> Co-authored-by: Mark Walker <mark@django-cms.org> * fix: Clear page permission cache on page create (#6866) * Clear page permission cache on page create * Correct changelog entry * Update test_add_page.py * Update CHANGELOG.rst Co-authored-by: Mark Walker <theshow@gmail.com> * fix: Changing color scheme resets session settings to defaults (#7407) * Fix: incorrect saveing of color scheme in CMS.settings * Add: changelog entry :-) * ci: Added pre-commit ci config (#7409) * perf: Don't count users when CMS_RAW_ID_USERS=True (#7414) * perf: Don't count users when CMS_RAW_ID_USERS=True When using CMS_RAW_ID_USERS=True on a Postgres database with many users, counting the users is slow and will always yield the same result. Only count users when using an integer value as a threshold and reuse the same logic for both PagePermissionInlineAdmin and GlobalPagePermissionAdmin. * Ensure that only integer settings of CMS_RAW_ID_USERS are compared to the number of users * Add documentation for the CMS_RAW_ID_USER=True setting * fix isort for added tests * Fix: in python this is always True: isinstance(False, int) Co-authored-by: Pankrat <lhaehne@gmail.com> * fix: CMS check management command fixed [#7412] (#7413) * fix: CMS check management command fixed [#7412] Co-authored-by: jefe <me@myself.ai> * ci: Some tests misusing assertTrue for comparisons fix (#7241) * Fix issue avoid-misusing-assert-true found at https://codereview.doctor * feat: Support for Django 4.1 (#7404) * support: Django 4.1 * Fix: apphook test * Run tests on all databases Co-authored-by: Vinit Kumar <mail@vinitkumar.me> Co-authored-by: Mark Walker <theshow@gmail.com> * build: bump django from 3.2.15 to 3.2.16 in /docs (#7417) * build: bump minimatch and gulp-if (#7416) Bumps [minimatch](https://github.com/isaacs/minimatch) to 3.0.4 and updates ancestor dependency [gulp-if](https://github.com/robrich/gulp-if). These dependencies need to be updated together. Updates `minimatch` from 1.0.0 to 3.0.4 - [Release notes](https://github.com/isaacs/minimatch/releases) - [Commits](isaacs/minimatch@v1.0.0...v3.0.4) Updates `gulp-if` from 1.2.5 to 3.0.0 - [Release notes](https://github.com/robrich/gulp-if/releases) - [Commits](https://github.com/robrich/gulp-if/commits/3.0.0) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect - dependency-name: gulp-if dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Fabian Braun <fsbraun@gmx.de> * fix: Added deprecation warning to `get_current_language()` (#7410) * fix: Added deprecation warning to `cms.utils.i18n.get_current_language()` * fix: Added deprecation warning to `cms.utils.i18n.get_current_language()` * Added stack level to deprecation warning Co-authored-by: Fabian Braun <fsbraun@gmx.de> * feat: add Python 3.11 support for Django CMS (#7422) * fix: test python3.11 Authored-by: Vinit Kumar <vinit.kumar@kidskonnect.nl> Signed-off-by: Vinit Kumar <vinit.kumar@kidskonnect.nl> * fix: Adds a deprecation warning for SEND_BROKEN_LINK_EMAILS (#7420) * Fix: toolbar bug 3.10.rc1 * Feat: Dark mode support, including input from @marksweb, bugfix for tooltips * Upstream change to be able to merge * Feat: Dark mode support, including input from @marksweb, bugfix for tooltips * Revert "Fix: toolbar bug 3.10.rc1" This reverts commit 592a2b6. * Fix: Recommit toolbar fix (??) * Fix: After lint failure: Remove spaces added by PyCharm * Fix: Wizzard button color * Fix: Correct toolbar according to cms_path Fix: Avoid unnecessary toolbar loading * TASK: use isort to sort imports * Fix: Move CMS.API.Toolbar.get_color_scheme to CMS.API.Helpers.getColorScheme and CMS.API.Toolbar.set_color_scheme to CMS.API.Helpers.setColorScheme * Fix: Typo in comment * Fix: Typos in comments * Fix: Typos in comments * Add: Changelog entry * Fix: base unit test for js frontend * Add: Basic set/get color scheme test * fix: deprecate SEND_BROKEN_LINK_EMAILS setting * fix: flake8 w504 Co-authored-by: Vinit Kumar <mail@vinitkumar.me> Co-authored-by: Simon Krull <krull@punkt.de> Co-authored-by: Mark Walker <theshow@gmail.com> * fix: Prefer titles matching request language (#7144) * prefer titles matching request language * add comments on use of annotate * fix wayward imports * Add changelog entry Co-authored-by: Vinit Kumar <mail@vinitkumar.me> Co-authored-by: Mark Walker <theshow@gmail.com> * [3.11.1rc1 release process] Building locales * [3.11.1rc1 release process] Bumped version to 3.11.1rc1 * [3.11.1rc1 release process] compilemessages * [3.11.1rc1 release process] compiling new static files * [3.11.1rc1 release process] updating latest docs * Update and rename .rst to 3.11.1.rst * Update 3.11.1.rst * Update index.rst * [3.11.1rc1 release process] Building locales * Update 3.11.1.rst * Update index.rst * Update index.rst * Update index.rst * Update index.rst * Update index.rst * Fix: Allow setup to run before dependencies are installed * Update transifex translations Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Vinit Kumar <vinit.kumar@kidskonnect.nl> Co-authored-by: Mark Walker <theshow@gmail.com> Co-authored-by: Christian Clauss <cclauss@me.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Hussein Srour <husseinfo@mail.com> Co-authored-by: Dapo Adedire <adedireadedapo19@gmail.com> Co-authored-by: Florian Delizy <fdelizy@logitech.com> Co-authored-by: Vinit Kumar <mail@vinitkumar.me> Co-authored-by: Simon Krull <simondotunix@gmail.com> Co-authored-by: Marco Bonetti <mbonetti@gmail.com> Co-authored-by: Conrad <grosserconrad@gmail.com> Co-authored-by: Patrick Mazulo <pmazulo@gmail.com> Co-authored-by: viliammihalik <79649195+viliammihalik@users.noreply.github.com> Co-authored-by: Shivan Sivakumaran <51132467+shivan-s@users.noreply.github.com> Co-authored-by: Qijia Liu <liumeo@pku.edu.cn> Co-authored-by: wesleysima <45492117+wesleysima@users.noreply.github.com> Co-authored-by: Mark Walker <mark@django-cms.org> Co-authored-by: Cage Johnson <cagejsn@gmail.com> Co-authored-by: G3RB3N <gerbenvaneerten@gmail.com> Co-authored-by: Pankrat <lhaehne@gmail.com> Co-authored-by: ton77v <50094687+ton77v@users.noreply.github.com> Co-authored-by: code-review-doctor <72647856+code-review-doctor@users.noreply.github.com> Co-authored-by: Vinit Kumar <vinit.kumar@kidskonnect.nl> Co-authored-by: Simon Krull <krull@punkt.de> Co-authored-by: Micah Denbraver <macro1@users.noreply.github.com>
* Add github actions for publishing on pyi * Fix branch trigger to branch `release/**` * Also run publish to test pypi on develop
Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2. - [Release notes](https://github.com/isaacs/minimatch/releases) - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](isaacs/minimatch@v3.0.4...v3.1.2) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2. - [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases) - [Commits](SamVerschueren/decode-uri-component@v0.2.0...v0.2.2) --- updated-dependencies: - dependency-name: decode-uri-component dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Fabian Braun <fsbraun@gmx.de>
marksweb
approved these changes
Jan 5, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Assuming the packages conflicts are ok, then this looks good
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR merges back the assets from the 3.11.1 release
Related resources
Checklist
develop