Skip to content

Commit

Permalink
Merge branch 'refs/heads/4.3' into dependabot/npm_and_yarn/sass-1.77.2
Browse files Browse the repository at this point in the history
# Conflicts:
#	html/bundle/admin.bundle.js.map
#	html/template/admin/assets/css/bootstrap.css.map
#	html/template/admin/assets/css/bootstrap.min.css.map
#	html/template/default/assets/css/style.css.map
#	html/template/default/assets/css/style.min.css.map
  • Loading branch information
dotani1111 committed May 29, 2024
2 parents f0b5bff + 6271626 commit 5619126
Show file tree
Hide file tree
Showing 11 changed files with 232 additions and 217 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"monolog/monolog": "^2.5",
"nesbot/carbon": "^2",
"psr/cache": "^3.0",
"psr/container": "^1.0",
"psr/container": "^2.0",
"psr/http-message": "^1.0",
"psr/log": "^1.0",
"psr/simple-cache": "^1.0",
Expand Down Expand Up @@ -102,7 +102,7 @@
"twig/extra-bundle": "^3.3",
"twig/intl-extra": "^3.3",
"twig/twig": "^3.8",
"vlucas/phpdotenv": "v5.4"
"vlucas/phpdotenv": "v5.6.0"
},
"require-dev": {
"captbaritone/mailcatcher-codeception-module": "^3.0",
Expand Down
333 changes: 174 additions & 159 deletions composer.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion html/bundle/admin.bundle.js

Large diffs are not rendered by default.

90 changes: 45 additions & 45 deletions html/bundle/admin.bundle.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,102 +62,102 @@
*/

/*!
* jQuery UI :data 1.13.2
* http://jqueryui.com
* jQuery UI :data 1.13.3
* https://jqueryui.com
*
* Copyright jQuery Foundation and other contributors
* Copyright OpenJS Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
* https://jquery.org/license
*/

/*!
* jQuery UI Disable Selection 1.13.2
* http://jqueryui.com
* jQuery UI Disable Selection 1.13.3
* https://jqueryui.com
*
* Copyright jQuery Foundation and other contributors
* Copyright OpenJS Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
* https://jquery.org/license
*/

/*!
* jQuery UI Keycode 1.13.2
* http://jqueryui.com
* jQuery UI Keycode 1.13.3
* https://jqueryui.com
*
* Copyright jQuery Foundation and other contributors
* Copyright OpenJS Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
* https://jquery.org/license
*/

/*!
* jQuery UI Mouse 1.13.2
* http://jqueryui.com
* jQuery UI Mouse 1.13.3
* https://jqueryui.com
*
* Copyright jQuery Foundation and other contributors
* Copyright OpenJS Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
* https://jquery.org/license
*/

/*!
* jQuery UI Position 1.13.2
* http://jqueryui.com
* jQuery UI Position 1.13.3
* https://jqueryui.com
*
* Copyright jQuery Foundation and other contributors
* Copyright OpenJS Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
* https://jquery.org/license
*
* http://api.jqueryui.com/position/
* https://api.jqueryui.com/position/
*/

/*!
* jQuery UI Resizable 1.13.2
* http://jqueryui.com
* jQuery UI Resizable 1.13.3
* https://jqueryui.com
*
* Copyright jQuery Foundation and other contributors
* Copyright OpenJS Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
* https://jquery.org/license
*/

/*!
* jQuery UI Scroll Parent 1.13.2
* http://jqueryui.com
* jQuery UI Scroll Parent 1.13.3
* https://jqueryui.com
*
* Copyright jQuery Foundation and other contributors
* Copyright OpenJS Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
* https://jquery.org/license
*/

/*!
* jQuery UI Sortable 1.13.2
* http://jqueryui.com
* jQuery UI Sortable 1.13.3
* https://jqueryui.com
*
* Copyright jQuery Foundation and other contributors
* Copyright OpenJS Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
* https://jquery.org/license
*/

/*!
* jQuery UI Tooltip 1.13.2
* http://jqueryui.com
* jQuery UI Tooltip 1.13.3
* https://jqueryui.com
*
* Copyright jQuery Foundation and other contributors
* Copyright OpenJS Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
* https://jquery.org/license
*/

/*!
* jQuery UI Unique ID 1.13.2
* http://jqueryui.com
* jQuery UI Unique ID 1.13.3
* https://jqueryui.com
*
* Copyright jQuery Foundation and other contributors
* Copyright OpenJS Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
* https://jquery.org/license
*/

/*!
* jQuery UI Widget 1.13.2
* http://jqueryui.com
* jQuery UI Widget 1.13.3
* https://jqueryui.com
*
* Copyright jQuery Foundation and other contributors
* Copyright OpenJS Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
* https://jquery.org/license
*/
2 changes: 1 addition & 1 deletion html/bundle/admin.bundle.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion html/template/admin/assets/css/bootstrap.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion html/template/admin/assets/css/bootstrap.min.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion html/template/default/assets/css/style.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion html/template/default/assets/css/style.min.css.map

Large diffs are not rendered by default.

8 changes: 4 additions & 4 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 @@ -45,7 +45,7 @@
"filepond-plugin-file-validate-type": "^1.2.8",
"filepond-plugin-image-preview": "^4.6.12",
"jquery": "^3.7.1",
"jquery-ui": "^1.13.2",
"jquery-ui": "^1.13.3",
"jquery.qrcode": "^1.0.3",
"ladda": "^2.0.3",
"slick-carousel": "^1.8.1",
Expand Down

0 comments on commit 5619126

Please sign in to comment.