Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/craftcms/cms into 5.0
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/web/assets/cp/dist/cp.js
#	src/web/assets/cp/dist/cp.js.map

[ci skip]
  • Loading branch information
brandonkelly committed Feb 6, 2024
2 parents c0fe9a6 + 3f481c5 commit 5d48fc1
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
- Fixed a bug where new entries would keep propagating all content across all sites for newly-created elements, even after switching to a different site.
- Fixed a bug where users with “Create entries” permission but not “Delete entries” weren’t allowed to delete their own unpublished drafts. ([#14294](https://github.com/craftcms/cms/issues/14294))
- Fixed a bug where Yii-provided Chinese translations weren’t getting picked up in the control panel. ([#14287](https://github.com/craftcms/cms/issues/14287))
- Fixed an alignment bug with sortable structure views. ([#14299](https://github.com/craftcms/cms/issues/14299))

## 5.0.0-alpha.11 - 2024-02-01

Expand Down
2 changes: 1 addition & 1 deletion src/web/assets/cp/dist/cp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/web/assets/cp/dist/cp.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/web/assets/cp/src/js/ElementTableSorter.js
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ Craft.ElementTableSorter = Garnish.DragSort.extend(
},
{
HELPER_MARGIN: 0,
LEVEL_INDENT: 44,
LEVEL_INDENT: 48,
MAX_GIVE: 22,

defaults: {
Expand Down

0 comments on commit 5d48fc1

Please sign in to comment.