build: Prepare v3.11.2 by merging develop into release/3.11.x #7525
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
Co-authored-by: Christian Clauss <cclauss@me.com> * ci: codespell config taken from django-cms#7292
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>
Remove bug in `python manage.py command`
* Release 3.10.0 RC1 (django-cms#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 (django-cms#7219) * Fix script typos (django-cms#7201) * [refactor] Typos in release scripts * This was correct. Co-authored-by: Simon Krull <simondotunix@gmail.com> * feat: Added concurrency option to github workflows (django-cms#7205) * fix: Disable workflow concurrency to bring stability back to the CI (django-cms#7209) * Upgrade Gulp and Nodejs (django-cms#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 (django-cms#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 (django-cms#7233) * Fix script typos (django-cms#7201) * [refactor] Typos in release scripts * This was correct. Co-authored-by: Simon Krull <simondotunix@gmail.com> * feat: Added concurrency option to github workflows (django-cms#7205) * fix: Disable workflow concurrency to bring stability back to the CI (django-cms#7209) * Upgrade Gulp and Nodejs (django-cms#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 (django-cms#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 (django-cms#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 (django-cms#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 (django-cms#7275) * Fixes django-cms#7288 by also catching AttributeError, when the current toolbar… (django-cms#7289) * Fixes django-cms#7288 by also catching AttributeError, when the current toolbar object doesn't define get_draft_url() * django-cms#7288: also catch AttributeError when `get_absolute_url()` isn't defined. * Fix for django 2.2 in middleware [django-cms#7290] (django-cms#7293) * Fix for django 2.2 in middleware [django-cms#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 (django-cms#7294) * Fix version number in bump commit * Fix release script version commit. (django-cms#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 (django-cms#7330) * fix: Use http rather than https in toolbar sites menu (django-cms#7331) * fix: Revert change to the toolbar sites menu to use ``http`` protocol (django-cms#7332) * fix: Rename changelog title to fix release script * fix: Changelog title for 3.10.1rc1 (django-cms#7345) * fix: Request missing from test rendering (django-cms#7346) * fix: Changelog titles for 3.10.x (django-cms#7347) * build: Release 3.10.1 (django-cms#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 [django-cms#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>
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>
* 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
* 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>
… also to the admin site (django-cms#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
* Allow partially overriding CMS_CACHE_DURATIONS * add doc and changelog Co-authored-by: Fabian Braun <fsbraun@gmx.de>
… redirect field (django-cms#7370) Co-authored-by: Patrick Mazulo <pmazulo@gmail.com> * feat: Add support for tel: and mailto: URIs in Advanced Page Settings redirect field
… admin (django-cms#7188) * django-cms#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 * django-cms#7155: extend unlocalisation of pks to a few more templates * django-cms#7175: cleanup, dont unlocalize in `if` tags * Update CHANGELOG about django-cms#7175 Co-authored-by: Fabian Braun <fsbraun@gmx.de> Co-authored-by: Mark Walker <mark@django-cms.org>
* 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>
…o-cms#7407) * Fix: incorrect saveing of color scheme in CMS.settings * Add: changelog entry :-)
* 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>
…#7413) * fix: CMS check management command fixed [django-cms#7412] Co-authored-by: jefe <me@myself.ai>
* Fix issue avoid-misusing-assert-true found at https://codereview.doctor
* 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>
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>
…ng (django-cms#7501) * Update install.rst * Update install.rst
Added a new setting that allow to configure globally if the django-cms redirects preserving the query parameters. `REDIRECT_PRESERVE_QUERY_PARAMS`. This feature is usefull for example: 1. marketing campains extra parameters, 2. social networks extra parameters like `fbclick`, 3. custom developed parameters, after that page has been moved, the older URLs for that page should preserve the functionality.
Co-authored-by: Nihal <nihal.r@qburst.com>
This commit adds the REDIRECT_TO_LOWERCASE_SLUG option which will cause the cms to redirect requests with an non-lowercase slug if no page with that slug is found. Implements django-cms#1324
* fix/merge_errors * Update incomplete color scheme docs * fix typos
* revert: test change done earlier * feat: add django 4.2a1 to requirements and to the CI * fix: typo in the test.yml file * fix: update django to the stable * feat: some more updates to get the CI running * fix: two lint related issues * fix: update compatibility matrix to include django 4.2 support
* Add deprecation warnings to cms.api * Fix typos --------- Co-authored-by: Vinit Kumar <vinit.kumar@kidskonnect.nl>
…7504) * revert: test change done earlier * feat: replace flake8 with ruff * fix: code cleanup as per ruff recommendations * fix: cleanup code * fix: use flake-to-ruff to convert our config to ruff.toml file * fix: one more bypass * fix: review feedback * fix: cleanup code for usage dict, list and unnecessary usage Authored-by: Vinit Kumar <vinit.kumar@kidskonnect.nl> Signed-off-by: Vinit Kumar <vinit.kumar@kidskonnect.nl> * fix: broken ci tests * fix: isort issues in the forms.py * fix: explanation of the rules bypass * fix: isort issues * revert: changes to the testcases.py * fix: use ruff to format imports * fix: ignore isort for this file as it causes circular import issues * Update cms/toolbar/toolbar.py Co-authored-by: Fabian Braun <fsbraun@gmx.de> * Update cms/api.py Co-authored-by: Fabian Braun <fsbraun@gmx.de> --------- Signed-off-by: Vinit Kumar <vinit.kumar@kidskonnect.nl> Co-authored-by: Fabian Braun <fsbraun@gmx.de>
* Add download stats to readme * Fix: Downloads at position 1 * Undo: Recover accidentally deleted line.
…form (django-cms#7486) * Better link change list to change form * Add filter for site
…which leads to unnecessary scoll bars (django-cms#7485)
django-cms#7488) * fix: replace ' by ′ in fr translation no more "page d\u0027accueil"! * Remove unnecessary escapes filter where translations {% filter "escapejs" %} ... {% endfilter %} only belongs to situations where data is put into html attributes or js code. Co-authored-by: Fabian Braun <fsbraun@gmx.de>
…ng (django-cms#7501) * Update install.rst * Update install.rst
Added a new setting that allow to configure globally if the django-cms redirects preserving the query parameters. `REDIRECT_PRESERVE_QUERY_PARAMS`. This feature is usefull for example: 1. marketing campains extra parameters, 2. social networks extra parameters like `fbclick`, 3. custom developed parameters, after that page has been moved, the older URLs for that page should preserve the functionality.
Co-authored-by: Nihal <nihal.r@qburst.com>
This commit adds the REDIRECT_TO_LOWERCASE_SLUG option which will cause the cms to redirect requests with an non-lowercase slug if no page with that slug is found. Implements django-cms#1324
* fix/merge_errors * Update incomplete color scheme docs * fix typos
* revert: test change done earlier * feat: add django 4.2a1 to requirements and to the CI * fix: typo in the test.yml file * fix: update django to the stable * feat: some more updates to get the CI running * fix: two lint related issues * fix: update compatibility matrix to include django 4.2 support
* Add deprecation warnings to cms.api * Fix typos --------- Co-authored-by: Vinit Kumar <vinit.kumar@kidskonnect.nl>
…7504) * revert: test change done earlier * feat: replace flake8 with ruff * fix: code cleanup as per ruff recommendations * fix: cleanup code * fix: use flake-to-ruff to convert our config to ruff.toml file * fix: one more bypass * fix: review feedback * fix: cleanup code for usage dict, list and unnecessary usage Authored-by: Vinit Kumar <vinit.kumar@kidskonnect.nl> Signed-off-by: Vinit Kumar <vinit.kumar@kidskonnect.nl> * fix: broken ci tests * fix: isort issues in the forms.py * fix: explanation of the rules bypass * fix: isort issues * revert: changes to the testcases.py * fix: use ruff to format imports * fix: ignore isort for this file as it causes circular import issues * Update cms/toolbar/toolbar.py Co-authored-by: Fabian Braun <fsbraun@gmx.de> * Update cms/api.py Co-authored-by: Fabian Braun <fsbraun@gmx.de> --------- Signed-off-by: Vinit Kumar <vinit.kumar@kidskonnect.nl> Co-authored-by: Fabian Braun <fsbraun@gmx.de>
…develop # Conflicts: # CHANGELOG.rst # cms/static/cms/js/dist/3.11.1/bundle.admin.base.min.js # cms/static/cms/js/dist/3.11.1/bundle.admin.pagetree.min.js # package-lock.json
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
Related resources
Checklist
develop