8000 chore: merge develop-4 into release/4.1.x by fsbraun · Pull Request #7886 · django-cms/django-cms · GitHub
[go: up one dir, main page]

Skip to content

chore: merge develop-4 into release/4.1.x #7886

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 71 commits into from
Apr 23, 2024

Conversation

fsbraun
Copy link
Member
@fsbraun fsbraun commented Apr 19, 2024

Description

This is a first PR to prepare releyse of django CMS 4.1.1

Related resources

  • #...
  • #...

Checklist

  • I have opened this pull request against develop-4
  • 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 30 commits January 5, 2024 16:20
* Fix: modal.scss dark-mode compatibilitiy

* Add: Build all assets as part of the frontend test

* fix: Better action feedback

* fix: Update _modal.scss

* fix: Remove publish/draft reference from grouper admin message

* fix ruff

* Add Django 4.2 support to release notes

* Fix transifex-pull-strings

* fix: Update transifex source file (django-cms#7629)

* Fix css glitch

* Update translations source fill which was missing strings

* Add migration for page content verbose name

* Fix: Open new plugin window in language of toolbar not of page (django-cms#7632)

* Fix: Broken page actions menu if CMS_PERMISSIONS is set

* Build: release 4.1.0rc4 (django-cms#7637)

* [4.1.0rc4 release process] Building locales

* [4.1.0rc4 release process] Bumped version to 4.1.0rc4

* [4.1.0rc4 release process] compilemessages

* [4.1.0rc4 release process] compiling new static files

* [4.1.0rc4 release process] updating latest docs

* Update CHANGELOG.rst

* Update 4.1.0.rst

---------

Co-authored-by: Github Release Action <info@django-cms.org>

* fix: en locale in `release/4.1.x` (django-cms#7638)

* Fix css glitch

* Update translations source fill which was missing strings

* Fix: en locale

* fix: en locale typo (django-cms#7639)

* Fix css glitch

* Update translations source fill which was missing strings

* Fix: en locale

* Fix typo

* Fix: typo: occured -> occurred

* undo mo change

* fix: Remove `can_publish` permission from django CMS 4 core (django-cms#7635)

* Fix css glitch

* Update translations source fill which was missing strings

* Fix: Remove can_publish permission

* Update _toolbar.scss

* ci: Merge back 4.1.0.rc5 build into release/4.1.x (django-cms#7720)

* [4.1.0rc5 release process] Building locales

* [4.1.0rc5 release process] Bumped version to 4.1.0rc5

* [4.1.0rc5 release process] compilemessages

* [4.1.0rc5 release process] compiling new static files

* [4.1.0rc5 release process] updating latest docs

* Create releases.yml

* Update releases.yml

* Update CHANGELOG.rst

---------

Co-authored-by: Github Release Action <info@django-cms.org>

* Update setup.cfg

* Remove py3.8 from setup.cfg

* feat: add v4 docs to main branch (django-cms#7722)

* Add docs

* Improve formatting

* Update formatting

* Update changelog for 4.0 from git logs

* Fix typos

* Update docs for frontend testing (django-cms#7726)

* fix: Update make-release script to evaluate git diff-index exit codes

* Update make-release to allow for empty messages commit

* chore: Merge `release/build` into `release/4.1.x` (django-cms#7729)

* [4.1.0 release process] Bumped version to 4.1.0

* [4.1.0 release process] compilemessages

* [4.1.0 release process] compiling new static files

* [4.1.0 release process] updating latest docs

* Restore 4.0 changelog entries

* fix: Django 5 only allows POST requests to log out (django-cms#7728)

* Django 5 only allows POST requests to log out

* Update test

* Update CHANGELOG.rst

* Update CHANGELOG.rst

---------

Co-authored-by: Github Release Action <info@django-cms.org>

* Apply suggestions from code review

* fix: Incomplete command to create a virtual env in docs (django-cms#7735)

* docs: Remove reference to rc5 from 01-install.rst

---------

Co-authored-by: Github Release Action <info@django-cms.org>
Co-authored-by: Leonardo Cavallucci <leo.cavallucci@gmail.com>
discard specific verbose_name from perms_needed
* Update how-to use placeholders within custom models

* Consistently name "slot" "slot_name"

* Apply suggestions from code review

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

* Update 01-placeholders.rst

---------

Co-authored-by: Mark Walker <theshow@gmail.com>
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 5.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](actions/setup-python@v2...v5)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.2 to 3.1.3.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](pallets/jinja@3.1.2...3.1.3)

---
updated-dependencies:
- dependency-name: jinja2
  dependency-type: indirect
...

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>
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@v2...v3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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>
django-cms#7740)

* fix: make messages readable in dark mode
let user close long messages (>160 characters)

* Reduce complexity but allow minimum
…ngo-cms#7766)

* do not call details view from apphook endpoint

closes django-cms#7765

* implement test for apphook without landing page

tests django-cms#7765

* Update 01-install.rst

* Update docs/introduction/01-install.rst

---------

Co-authored-by: Fabian Braun <fsbraun@gmx.de>
* Update github issue and PR templates

* Update ---documentation-report.md
Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](actions/cache@v3...v4)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
)

Bumps [django](https://github.com/django/django) from 3.2.16 to 3.2.23.
- [Commits](django/django@3.2.16...3.2.23)

---
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>
…go-cms#7772)

* fix: Redirect user to edit url on success

* fix: add test for when `edit_mode_on_success` is False

* fix: remove the u string prefix

---------

Co-authored-by: Fabian Braun <fsbraun@gmx.de>
* chore: Added ruff format config

* chore: Set shorter docstring line length

* chore: Update ruff

* chore: Remove old config
…jango-cms#7787)

* Fixed browser freezing on cms toolbar markup refresh after plugin edit (django-cms#7070)

* Fixed browser freezing on cms toolbar markup refresh after plugin edit

* Updated tests to work with fix

* Removed unused variables

* Removing unused Diff-DOM definition

* Fix typos and accidentally deleted imports during the merge

* Update cms/static/cms/js/modules/cms.changeform.js

---------

Co-authored-by: nichoski <nichoski@gmail.com>
fsbraun and others added 18 commits March 25, 2024 10:20
…go-cms#7853)

* Fix: views.details revealed existence of unpublished language

* Update comments

* Optimize qs

* Remove unnecessary changes
)

Bumps [black](https://github.com/psf/black) from 22.12.0 to 24.3.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](psf/black@22.12.0...24.3.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: indirect
...

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>
)

Bumps [django](https://github.com/django/django) from 3.2.24 to 3.2.25.
- [Commits](django/django@3.2.24...3.2.25)

---
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>
Co-authored-by: Fabian Braun <fsbraun@gmx.de>
…cms#7843)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.15.2...v1.15.6)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

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>
Removes [axios](https://github.com/axios/axios). It's no longer used after updating ancestor dependency [browser-sync](https://github.com/BrowserSync/browser-sync). These dependencies need to be updated together.


Removes `axios`

Updates `browser-sync` from 2.29.3 to 3.0.2
- [Release notes](https://github.com/BrowserSync/browser-sync/releases)
- [Changelog](https://github.com/BrowserSync/browser-sync/blob/master/CHANGELOG.md)
- [Commits](BrowserSync/browser-sync@v2.29.3...v3.0.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: indirect
- dependency-name: browser-sync
  dependency-type: direct:development
...

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>
Co-authored-by: Vinit Kumar <vinit.kumar@kidskonnect.nl>
…s#7778)

Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.12 to 1.26.18.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@1.26.12...1.26.18)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-type: indirect
...

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>
* feat: Add RTL support to toolbar

* fix: Add logical text-align value for toolbar dropdown

* fix: Correctly calculate available width of toolbar

* fix: Fix weird floating bug with toolbar more buttons
)

Bumps [sqlparse](https://github.com/andialbrecht/sqlparse) from 0.4.3 to 0.5.0.
- [Changelog](https://github.com/andialbrecht/sqlparse/blob/master/CHANGELOG)
- [Commits](andialbrecht/sqlparse@0.4.3...0.5.0)

---
updated-dependencies:
- dependency-name: sqlparse
  dependency-type: in
F438
direct
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [idna](https://github.com/kjd/idna) from 3.4 to 3.7.
- [Release notes](https://github.com/kjd/idna/releases)
- [Changelog](https://github.com/kjd/idna/blob/master/HISTORY.rst)
- [Commits](kjd/idna@v3.4...v3.7)

---
updated-dependencies:
- dependency-name: idna
  dependency-type: indirect
...

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>
…cms#7884)


* Adds reference docs to some plugin utility functions.

* add more docstrings

* Update docs
@fsbraun fsbraun changed the title chore chore: merge develop-4 into release/4.1.x Apr 19, 2024
macolo and others added 7 commits April 20, 2024 11:17
* Replace Slack with Discord

* more occurrences

---------

Co-authored-by: Mario Colombo <mario@what.digital>
Co-authored-by: Fabian Braun <fsbraun@gmx.de>
* fix django-cms#7826

* fix: CMS widgets need not load if they are read-only fields

* Fix page select widget

* Fix: typ

---------

Co-authored-by: Jacob Rief <jacob.rief@gmail.com>
@fsbraun fsbraun merged commit f5409b8 into django-cms:release/4.1.x Apr 23, 2024
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.

0