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 develop-4 into release/4.1.x #7542

Merged
merged 16 commits into from
Apr 25, 2023

Conversation

fsbraun
Copy link
Sponsor Member

@fsbraun fsbraun commented Apr 25, 2023

Description

Related resources

  • #...
  • #...

Checklist

  • I have opened this pull request against develop
  • I have added or modified the tests when changing logic
  • I have followed the conventional commits guidelines to add meaningful information into the changelog
  • I have read the contribution guidelines and I have joined #workgroup-pr-review on Slack to find a “pr review buddy” who is going to review my pull request.

fsbraun and others added 16 commits January 23, 2023 14:05
…onField (django-cms#7479)

* Add: helper function get_placeholder_from_slot to support PlaceholderRelationField

* Fix flake8 for test

* Refactor get_placeholder_with_slot to be in utils.placeholder

* Add: more docs
* Fix:		subpages lack version object after copying
* Add error message
* Update cms/models/pagemodel.py

Co-authored-by: Mark Walker <theshow@gmail.com>

* Fix: copy management command
* Fix duplicate page and test
* Clearify navigation status error message

---------

Co-authored-by: Mark Walker <theshow@gmail.com>
* Update icons with bootstrap icons

* Add: icon-only css file

* Add moderation icon, refine publish icons

* Update readme and changelog entries

* Add settings icons

* Add icons

* Fix alias icons, add rename icon for alias

* Update pencil

* Update settings and advanced-settings icons

* Remove validate icons

* Add manage-versions icon

* Remove deprecated icons

* Mark deprecated icons (source files)

* fix corrupted squares icon

* Unchange woff2 asset
* feat/current_content

* Add comments to manager methods

* Update managers.py

* Fix flake8

* Update managers.py

* Update managers.py

* Update managers.py

* Update test_page.py

* Update managers.py

* Fix flake8 issues
* feat/current_content

* Add comments to manager methods

* Update managers.py

* Fix flake8

* Update managers.py

* Update managers.py

* Update managers.py

* Update test_page.py

* Update managers.py

* Fix flake8 issues

* Fix:		Page settings always for the current version of a page

* add manager methods for admin manager
… configured (django-cms#7508)

* feat/current_content

* Add comments to manager methods

* Update managers.py

* Fix flake8

* Update managers.py

* Update managers.py

* Update managers.py

* Update test_page.py

* Update managers.py

* Fix flake8 issues

* Fix: Do not show language menu if only one language is installed

* (add comment)

* fix: flake8 error
* Activate app hooks on the preview and edit endpoints

* Add: resolver_match to toolbar to allow apphooks to identify namespaces and instances

* Remove duplication

* Add no_apphook page

* Keep toolbar._resolver_match private

* fix isort

* Add missing stacklevel argument to warning in cms.api.create_page

* Update page_rendering.py

* Update toolbar.py

* Add some comments
)

* feat/current_content

* Add comments to manager methods

* Update managers.py

* Fix flake8

* Update managers.py

* Update managers.py

* Update managers.py

* Update test_page.py

* Update managers.py

* Fix flake8 issues

* feat: add setting to redirect slugs to lowercase (django-cms#7509)

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

* Cherry pick django-cms#7509

* Update test

* Fix flake8

* Add: Keep query params option

* fix indentation

---------

Co-authored-by: pajowu <pajowu@pajowu.de>
* feat/current_content

* Add comments to manager methods

* Update managers.py

* Fix flake8

* Update managers.py

* Update managers.py

* Update managers.py

* Update test_page.py

* Update managers.py

* Fix flake8 issues

* `django.utils.translations.get_language_from_request` can return `None`

* Add Django 4.2 tests to github actions

* Update psycopg2 version requirement

* Update mysql version

* Remove request copying when duplicating

* Update setup.py

* Update setup.py to allow for Django 4.2!
* feat:grouper mixin

* separate out list action mixin

* fix js to retain get parameters

* Fix: Uniform dropdown styling

* fix: flake8 errors

* Update docstrings

* Fix docs and naming

* Turn mixin factory into class

* Remove print statement

* Add test environment

* Update tests

* Update tests

* Update tests

* Minor fixes, moved content form fields to `content__{field_name}`

* Add comments to tests

* Update tests and templates

* fix flake8

* Update camel case convention, tests for it, docs

* fix isort

* Update test suite

* Create admin manager if missing

* Remove unneeded files

* Remove unused import

* Fix change_list template

* Update tests to cover availability of languages

* Add type hints

* Add missing space.

* Update type hints

* Fix error in type hints

* Make type hints compatible with py37 and py38

* Fix bug and improve test coverage

* Add sortable fields (case insensitive for CharFields) in change list view

* Update comments

* fix docstring and missing prefix

* Update messages

* Fix: getting non-display fields, minor translation issues

* Fix missing button css

* Update alias icon

* Fix: Set the correct language of the preview link

* Update alias login

* Update cms/tests/test_grouper_admin.py

Co-authored-by: Andrew Aikman <Aiky30@users.noreply.github.com>

* Adjstments suggested by aiky30

* Fix test requirements

* Make AAA test structure more transparent

* Fix typo in test requirements

* AAA

---------

Co-authored-by: Andrew Aikman <Aiky30@users.noreply.github.com>
…rd of django-cms#6851 to v4) (django-cms#7527)

* fix: prefix_default_language = False redirect behavior fixes (django-cms#6851)

* make is_language_prefix_patterns_used check for non-empty language_prefix insted of doing isinstance check on pattern only
* if prefix patterns are used get_language_from_request normally, otherwise default
* updated CHANGELOG
* remove previous details request_language change and replace it with page model cache workaround
* fix tests
* if prefix patterns are used get_language_from_request normally, otherwise default
* add language check workaround to menus as well

Co-authored-by: Radosław Stępień <rstepien@cloudferro.com>
Co-authored-by: Florian Delizy <florian.delizy@gmail.com>

* Fix flake8 issue

---------

Co-authored-by: Radek Stępień <rstepien@protonmail.com>
Co-authored-by: Radosław Stępień <rstepien@cloudferro.com>
Co-authored-by: Florian Delizy <florian.delizy@gmail.com>
* feat: add pyproject.toml for ruff config

* feat: enable ruff to the linter, replace flake8 and isort

* fix: autofix cms issues

* fix: autofix menus issues

* fix: make the exception more specific and not naked exception to catch all exceptions

* fix: add noqa to bypass the check as the test clearly states and needs it to be naked to handle an array of cases

* fix: revert ruff changes to model init as order is v important here and can't be altered

* fix: no newlines

* fix: comment the static analysis tests for pyflakes

* fix: import issues fixed with ruff

* Update cms/models/managers.py

Co-authored-by: Fabian Braun <fsbraun@gmx.de>

* fix: implement feedback from @fsbraun

* fix: disable w605 fo5 for whole file as doing it for a text inside doc block was not working

* fix: add ruff to requirements as we need it to work in tests

---------

Co-authored-by: Fabian Braun <fsbraun@gmx.de>
* fix/hide_legacy_features

* Fix linting problems
@fsbraun fsbraun merged commit 322a75e into django-cms:release/4.1.x Apr 25, 2023
87 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants