Skip to content

Commit e3eb6c5

Browse files
magento-devops-queue-mgr-svcmagento-devops-queue-mgr-svc
authored
Merge branch '2.4-develop' into ACP2E-3118
2 parents a31f8f1 + 7cabfb4 commit e3eb6c5

File tree

436 files changed

+8
-3379
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

436 files changed

+8
-3379
lines changed

‎app/code/Magento/Backend/Block/Media/Uploader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public function getImageUploadMaxHeight()
145145
*/
146146
protected function _prepareLayout()
147147
{
148-
$this->pageConfig->addPageAsset('jquery/fileUploader/css/jquery.fileupload-ui.css');
148+
$this->pageConfig->addPageAsset('jquery/uppy/dist/uppy.fileupload-ui.css');
149149
return parent::_prepareLayout();
150150
}
151151

‎app/code/Magento/Catalog/view/adminhtml/layout/catalog_category_add.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<update handle="styles"/>
1010
<head>
11-
<css src="jquery/fileUploader/css/jquery.fileupload-ui.css"/>
11+
<css src="jquery/uppy/dist/uppy.fileupload-ui.css"/>
1212
<link src="Magento_Catalog::js/edit-tree.js"/>
1313
</head>
1414
<update handle="editor"/>

‎app/code/Magento/Catalog/view/adminhtml/layout/catalog_category_edit.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<update handle="styles"/>
1010
<head>
11-
<css src="jquery/fileUploader/css/jquery.fileupload-ui.css"/>
11+
<css src="jquery/uppy/dist/uppy.fileupload-ui.css"/>
1212
<link src="Magento_Catalog::js/edit-tree.js"/>
1313
</head>
1414
<update handle="editor"/>

‎app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_new.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<update handle="styles"/>
1010
<head>
11-
<css src="jquery/fileUploader/css/jquery.fileupload-ui.css"/>
11+
<css src="jquery/uppy/dist/uppy.fileupload-ui.css"/>
1212
</head>
1313
<update handle="editor"/>
1414
<update handle="catalog_product_form"/>

‎app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_edit.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<head>
10-
<css src="jquery/fileUploader/css/jquery.fileupload-ui.css"/>
10+
<css src="jquery/uppy/dist/uppy.fileupload-ui.css"/>
1111
</head>
1212
<update handle="editor"/>
1313
<body>

‎app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_edit.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<head>
10-
<css src="jquery/fileUploader/css/jquery.fileupload-ui.css"/>
10+
<css src="jquery/uppy/dist/uppy.fileupload-ui.css"/>
1111
</head>
1212
<update handle="editor"/>
1313
<body>

‎app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_edit.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<head>
10-
<css src="jquery/fileUploader/css/jquery.fileupload-ui.css"/>
10+
<css src="jquery/uppy/dist/uppy.fileupload-ui.css"/>
1111
<css src="Magento_Theme::css/theme.css"/>
1212
<css src="prototype/windows/themes/default.css"/>
1313
<link src="Magento_Theme::js/bootstrap.js"/>

‎lib/web/extjs/defaults.js

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎lib/web/extjs/ext-tree-checkbox.js

Lines changed: 0 additions & 312 deletions
This file was deleted.

0 commit comments

Comments
 (0)