Skip to content

Commit

Permalink
Merge branch '5.6' into feature/redirects
Browse files Browse the repository at this point in the history
[ci skip]
  • Loading branch information
brandonkelly committed Jan 11, 2025
2 parents ab82281 + c5b7de4 commit 8735a83
Show file tree
Hide file tree
Showing 359 changed files with 9,409 additions and 3,476 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- 5.x
- '5.6'
pull_request:
permissions:
contents: read
Expand Down
167 changes: 167 additions & 0 deletions CHANGELOG-WIP.md

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,19 @@

## Unreleased

- Fixed a bug where the control panel could display a notice about the Craft CMS license belonging to a different domain, even when accessing the control panel from the correct domain. ([#16396](https://github.com/craftcms/cms/issues/16396))
- Fixed a bug where field layout elements’ action menus could have an empty action group.

## 5.5.9 - 2025-01-06

- Fixed a bug where custom fields could cause validation errors when running the `users/create` command.
- Fixed a bug where deleting a volume folder wasn’t fully deleting asset data in descendant folders.
- Fixed a bug where `ancestors`, `children`, `descendants`, and `parent` eager-loading wasn’t working on some environments. ([#16381](https://github.com/craftcms/cms/issues/16381), [#16382](https://github.com/craftcms/cms/issues/16382))
- Fixed a JavaScript error that could occur if there was a problem applying changes to field layout elements. ([#16380](https://github.com/craftcms/cms/issues/16380))
- Fixed a bug where field layout designers were validating field names, handles, and instructions, even if they weren’t overridden within the field instance. ([#16380](https://github.com/craftcms/cms/issues/16380))
- Fixed an error that occurred when upgrading to Craft 5. ([#16383](https://github.com/craftcms/cms/issues/16383))
- Fixed a bug where “Full Name” could appear twice in the user card attributes list. ([#16358](https://github.com/craftcms/cms/issues/16358))
- Fixed a bug where multi-site element queries could return an incorrect number of results if the `search` param was used in conjunction with `offset` or `limit`. ([#16183](https://github.com/craftcms/cms/issues/16183))

## 5.5.8 - 2025-01-02

Expand Down
4 changes: 3 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@
"pragmarx/recovery": "^0.2.1",
"samdark/yii2-psr-log-target": "^1.1.3",
"seld/cli-prompt": "^1.0.4",
"symfony/css-selector": "^6.0|^7.0",
"symfony/dom-crawler": "^6.0|^7.0",
"symfony/filesystem": "^6.3",
"symfony/http-client": "^6.0.3",
"symfony/property-access": "^7.0",
Expand All @@ -62,7 +64,7 @@
"symfony/var-dumper": "^5.0|^6.0",
"symfony/yaml": "^5.2.3",
"theiconic/name-parser": "^1.2",
"twig/twig": "~3.14.0",
"twig/twig": "~3.15.0",
"voku/stringy": "^6.4.0",
"web-auth/webauthn-lib": "~4.9.0",
"webonyx/graphql-php": "~14.11.5",
Expand Down
Loading

0 comments on commit 8735a83

Please sign in to comment.