Skip to content

Commit 829c0d9

Browse files
Merge pull request #75 from magento-cia/2.4.5-develop-2.4-develop-sync-041922
Sync of 2.4.5-develop with 2.4-develop
2 parents 2b74ca3 + 27fd9a9 commit 829c0d9

File tree

10 files changed

+10
-9
lines changed

10 files changed

+10
-9
lines changed

AdobeStockAdminUi/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-adobe-stock-admin-ui",
33
"description": "Magento module responsible for the admin panel UI implementation",
44
"require": {
5-
"php": "~7.4.0||~8.0.0||~8.1.0",
5+
"php": "~7.4.0||~8.1.0",
66
"magento/framework": "*",
77
"magento/module-adobe-ims-api": "*",
88
"magento/module-adobe-stock-client-api": "*",

AdobeStockAsset/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-adobe-stock-asset",
33
"description": "Magento module responsible for the Adobe Stock assets handling implementation on Magento side",
44
"require": {
5-
"php": "~7.4.0||~8.0.0||~8.1.0",
5+
"php": "~7.4.0||~8.1.0",
66
"magento/framework": "*",
77
"magento/module-adobe-stock-asset-api": "*",
88
"magento/module-adobe-stock-client-api": "*",

AdobeStockAssetApi/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-adobe-stock-asset-api",
33
"description": "Magento module responsible for Adobe Stock assets handling on Magento side",
44
"require": {
5-
"php": "~7.4.0||~8.0.0||~8.1.0",
5+
"php": "~7.4.0||~8.1.0",
66
"magento/framework": "*"
77
},
88
"type": "magento2-module",

AdobeStockClient/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-adobe-stock-client",
33
"description": "Magento module responsible for interaction with Adobe Stock API implementation",
44
"require": {
5-
"php": "~7.4.0||~8.0.0||~8.1.0",
5+
"php": "~7.4.0||~8.1.0",
66
"magento/framework": "*",
77
"magento/module-adobe-ims-api": "*",
88
"magento/module-adobe-stock-client-api": "*",

AdobeStockClientApi/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-adobe-stock-client-api",
33
"description": "Magento module responsible for interaction with Adobe Stock API",
44
"require": {
5-
"php": "~7.4.0||~8.0.0||~8.1.0",
5+
"php": "~7.4.0||~8.1.0",
66
"magento/framework": "*"
77
},
88
"type": "magento2-module",

AdobeStockImage/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-adobe-stock-image",
33
"description": "Magento module responsible for the images handling implementation",
44
"require": {
5-
"php": "~7.4.0||~8.0.0||~8.1.0",
5+
"php": "~7.4.0||~8.1.0",
66
"magento/framework": "*",
77
"magento/module-adobe-stock-client-api": "*",
88
"magento/module-adobe-stock-asset-api": "*",

AdobeStockImageAdminUi/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-adobe-stock-image-admin-ui",
33
"description": "Magento module responsible for the admin panel images UI implementation",
44
"require": {
5-
"php": "~7.4.0||~8.0.0||~8.1.0",
5+
"php": "~7.4.0||~8.1.0",
66
"magento/framework": "*",
77
"magento/module-adobe-ims": "*",
88
"magento/module-adobe-ims-api": "*",

AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/preview/actions.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,7 @@ define([
580580
// eslint-disable-next-line no-unused-vars
581581
var timerId;
582582

583+
// eslint-disable-next-line no-unused-vars
583584
timerId = setTimeout(function () {
584585
clearTimeout(timerId);
585586
this.messages.removeAll();

AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/preview/related.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ define([
127127

128128
/* Switch to the model tab if the series tab is hidden */
129129
if (relatedImages.series[record.id].length === 0 && relatedImages.model[record.id].length > 0) {
130-
// eslint-disable-next-line jquery-no-click-event-shorthand
130+
// eslint-disable-next-line jquery-no-input-event-shorthand
131131
$('#adobe-stock-tabs').data().mageTabs.select(1);
132132
}
133133
}.bind(this));

AdobeStockImageApi/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-adobe-stock-image-api",
33
"description": "Magento module responsible for the images handling",
44
"require": {
5-
"php": "~7.4.0||~8.0.0||~8.1.0",
5+
"php": "~7.4.0||~8.1.0",
66
"magento/framework": "*"
77
},
88
"type": "magento2-module",

0 commit comments

Comments
 (0)