Skip to content

Commit

Permalink
Merge branch '4.10' of https://github.com/craftcms/cms into 5.2
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG-WIP.md
#	composer.lock
#	package-lock.json
#	src/web/assets/admintable/dist/css/app.css
#	src/web/assets/admintable/dist/css/app.css.map
#	src/web/assets/admintable/dist/js/app.js
#	src/web/assets/admintable/dist/js/app.js.map
#	src/web/assets/graphiql/dist/graphiql.js
#	src/web/assets/graphiql/dist/graphiql.js.map
#	src/web/assets/inputmask/dist/jquery.inputmask.bundle.js
#	src/web/assets/inputmask/dist/jquery.inputmask.bundle.js.LICENSE.txt
#	src/web/assets/pluginstore/dist/css/app.css.map
#	src/web/assets/pluginstore/dist/js/app.js
#	src/web/assets/pluginstore/dist/js/app.js.map
#	src/web/assets/punycode/dist/punycode.js
  • Loading branch information
brandonkelly committed Jun 1, 2024
2 parents 3c0a768 + 6837ebc commit 34e597a
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 29 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG-WIP.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,5 @@
- The Debug Toolbar now pre-serializes objects stored as request parameters, fixing a bug where closures could prevent the entire Request panel from showing up. ([#14982](https://github.com/craftcms/cms/discussions/14982))
- Batched queue jobs now verify that they are still reserved before each step, and before spawning additional batch jobs. ([#14986](https://github.com/craftcms/cms/discussions/14986))
- The search keyword index is now updated for owner elements, when a nested element is saved directly which belongs to a searchable custom field.
- Updated Yii to 2.0.50.
- Updated inputmask to 5.0.9.
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"voku/stringy": "^6.4.0",
"web-auth/webauthn-lib": "~4.8.0",
"webonyx/graphql-php": "~14.11.5",
"yiisoft/yii2": "~2.0.48.1",
"yiisoft/yii2": "~2.0.50",
"yiisoft/yii2-debug": "~2.1.22.0",
"yiisoft/yii2-queue": "~2.3.2",
"yiisoft/yii2-symfonymailer": "^4.0.0"
Expand All @@ -86,10 +86,10 @@
"yiisoft/yii2-redis": "^2.0"
},
"provide": {
"bower-asset/inputmask": "~3.2.2|~3.3.5",
"bower-asset/jquery": "3.5.*@stable|3.4.*@stable|3.3.*@stable|3.2.*@stable|3.1.*@stable|2.2.*@stable|2.1.*@stable|1.11.*@stable|1.12.*@stable",
"bower-asset/punycode": "1.3.*",
"bower-asset/yii2-pjax": "~2.0.1",
"bower-asset/inputmask": "5.0.9",
"bower-asset/jquery": "3.6.1",
"bower-asset/punycode": "2.3.1",
"bower-asset/yii2-pjax": "2.0.8",
"yii2tech/ar-softdelete": "1.0.4"
},
"conflict": {
Expand Down
22 changes: 11 additions & 11 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"graphql": "^15.8.0",
"htmx.org": "^1.6.1",
"iframe-resizer": "^4.3.2",
"inputmask": "^5.0.7",
"inputmask": "^5.0.9",
"jquery": "^3.6.0",
"jquery-ui": "^1.13.1",
"jquery.payment": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/web/assets/inputmask/dist/jquery.inputmask.bundle.js

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
/*!
* dist/jquery.inputmask
* https://github.com/RobinHerbots/Inputmask
* Copyright (c) 2010 - 2023 Robin Herbots
* Copyright (c) 2010 - 2024 Robin Herbots
* Licensed under the MIT license
* Version: 5.0.8
* Version: 5.0.9
*/

/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
2 changes: 1 addition & 1 deletion src/web/assets/pluginstore/dist/css/app.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/web/assets/pluginstore/dist/css/app.css.map

Large diffs are not rendered by default.

0 comments on commit 34e597a

Please sign in to comment.