Skip to content

Commit 7e9b873

Browse files
author
magento packaging service
committed
Version 2.1.5-p10
1 parent 8f00fd3 commit 7e9b873

File tree

15 files changed

+84
-59
lines changed

15 files changed

+84
-59
lines changed

‎AdobeStockAdminUi/composer.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
{
22
"name": "magento/module-adobe-stock-admin-ui",
33
"description": "Magento module responsible for the admin panel UI implementation",
4+
"type": "magento2-module",
5+
"license": [
6+
"OSL-3.0",
7+
"AFL-3.0"
8+
],
9+
"version": "1.3.3",
410
"require": {
511
"php": "~8.1.0||~8.2.0",
612
"magento/framework": "*",
713
"magento/module-admin-adobe-ims": "*",
814
"magento/module-adobe-ims-api": "*",
9-
"magento/module-adobe-stock-client-api": "*",
15+
"magento/module-adobe-stock-client-api": "2.1.*",
1016
"magento/module-backend": "*",
1117
"magento/module-config": "*"
1218
},
1319
"suggest": {
1420
"magento/module-cms": "*"
1521
},
16-
"type": "magento2-module",
17-
"license": [
18-
"OSL-3.0",
19-
"AFL-3.0"
20-
],
2122
"autoload": {
2223
"files": [
2324
"registration.php"
@@ -27,3 +28,4 @@
2728
}
2829
}
2930
}
31+

‎AdobeStockAsset/composer.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
{
22
"name": "magento/module-adobe-stock-asset",
33
"description": "Magento module responsible for the Adobe Stock assets handling implementation on Magento side",
4+
"type": "magento2-module",
5+
"license": [
6+
"OSL-3.0",
7+
"AFL-3.0"
8+
],
9+
"version": "1.3.2",
410
"require": {
511
"php": "~8.1.0||~8.2.0",
612
"magento/framework": "*",
7-
"magento/module-adobe-stock-asset-api": "*",
8-
"magento/module-adobe-stock-client-api": "*",
13+
"magento/module-adobe-stock-asset-api": "2.0.*",
14+
"magento/module-adobe-stock-client-api": "2.1.*",
915
"magento/module-media-gallery-api": "*",
1016
"magento/module-media-gallery": "*",
1117
"magento/module-config": "*"
1218
},
13-
"type": "magento2-module",
14-
"license": [
15-
"OSL-3.0",
16-
"AFL-3.0"
17-
],
1819
"autoload": {
1920
"files": [
2021
"registration.php"
@@ -30,3 +31,4 @@
3031
}
3132
}
3233
}
34+

‎AdobeStockAssetApi/composer.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
{
22
"name": "magento/module-adobe-stock-asset-api",
33
"description": "Magento module responsible for Adobe Stock assets handling on Magento side",
4-
"require": {
5-
"php": "~8.1.0||~8.2.0",
6-
"magento/framework": "*"
7-
},
84
"type": "magento2-module",
95
"license": [
106
"OSL-3.0",
117
"AFL-3.0"
128
],
9+
"version": "2.0.2",
10+
"require": {
11+
"php": "~8.1.0||~8.2.0",
12+
"magento/framework": "*"
13+
},
1314
"autoload": {
1415
"files": [
1516
"registration.php"
@@ -19,3 +20,4 @@
1920
}
2021
}
2122
}
23+

‎AdobeStockClient/composer.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
{
22
"name": "magento/module-adobe-stock-client",
33
"description": "Magento module responsible for interaction with Adobe Stock API implementation",
4+
"type": "magento2-module",
5+
"license": [
6+
"OSL-3.0",
7+
"AFL-3.0"
8+
],
9+
"version": "1.3.3",
410
"require": {
511
"php": "~8.1.0||~8.2.0",
612
"magento/framework": "*",
713
"magento/module-adobe-ims-api": "*",
8-
"magento/module-adobe-stock-client-api": "*",
14+
"magento/module-adobe-stock-client-api": "2.1.*",
915
"astock/stock-api-libphp": "^1.1.2"
1016
},
11-
"type": "magento2-module",
12-
"license": [
13-
"OSL-3.0",
14-
"AFL-3.0"
15-
],
1617
"autoload": {
1718
"files": [
1819
"registration.php"
@@ -28,3 +29,4 @@
2829
}
2930
}
3031
}
32+

‎AdobeStockClientApi/composer.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
{
22
"name": "magento/module-adobe-stock-client-api",
33
"description": "Magento module responsible for interaction with Adobe Stock API",
4-
"require": {
5-
"php": "~8.1.0||~8.2.0",
6-
"magento/framework": "*"
7-
},
84
"type": "magento2-module",
95
"license": [
106
"OSL-3.0",
117
"AFL-3.0"
128
],
9+
"version": "2.1.3",
10+
"require": {
11+
"php": "~8.1.0||~8.2.0",
12+
"magento/framework": "*"
13+
},
1314
"autoload": {
1415
"files": [
1516
"registration.php"
@@ -19,3 +20,4 @@
1920
}
2021
}
2122
}
23+

‎AdobeStockImage/composer.json

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
{
22
"name": "magento/module-adobe-stock-image",
33
"description": "Magento module responsible for the images handling implementation",
4+
"type": "magento2-module",
5+
"license": [
6+
"OSL-3.0",
7+
"AFL-3.0"
8+
],
9+
"version": "1.3.4",
410
"require": {
511
"php": "~8.1.0||~8.2.0",
612
"magento/framework": "*",
7-
"magento/module-adobe-stock-client-api": "*",
8-
"magento/module-adobe-stock-asset-api": "*",
9-
"magento/module-adobe-stock-image-api": "*",
13+
"magento/module-adobe-stock-client-api": "2.1.*",
14+
"magento/module-adobe-stock-asset-api": "2.0.*",
15+
"magento/module-adobe-stock-image-api": "1.3.*",
1016
"magento/module-media-gallery-api": "*",
1117
"magento/module-media-gallery-synchronization-api": "*"
1218
},
1319
"suggest": {
1420
"magento/module-catalog": "*"
1521
},
16-
"type": "magento2-module",
17-
"license": [
18-
"OSL-3.0",
19-
"AFL-3.0"
20-
],
2122
"autoload": {
2223
"files": [
2324
"registration.php"
@@ -27,3 +28,4 @@
2728
}
2829
}
2930
}
31+

‎AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockImageData.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,10 @@
2424
<data key="category">Castles</data>
2525
<data key="author">gam16</data>
2626
</entity>
27+
<entity name="AdobeStockUnlicensedNewImage">
28+
<data key="id">{{_CREDS.magento/adobe_stock_not_licensed_new_image}}</data>
29+
<data key="status">Unlicensed</data>
30+
<data key="category">Family Life</data>
31+
<data key="author">Drobot Dean</data>
32+
</entity>
2733
</entities>

‎AdobeStockImageAdminUi/Test/Mftf/Section/AdminAdobeStockImagePreviewSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,6 @@
3535
<element name="moreFromThisSeriesSeeMore" selector="//div[@aria-labelledby='series_tab']//div[@class='see-more-wrapper']" type="button"/>
3636
<element name="seeMoreFromSeriesImages" type="block" selector="//*[@id='adobe-stock-images-search-modal']//div[@class='see-more-wrapper']"/>
3737
<element name="imagePreviewTitle" type="text" selector=".preview-row-content .title"/>
38+
<element name="firstKeywordNotAI" type="text" selector="//*[@id='adobe-stock-images-search-modal']//div[@class='keyword' and not(contains(.,'nobody'))][1]"/>
3839
</section>
3940
</sections>

‎AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesSeeMoreTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</actionGroup>
3535
<grabTextFrom selector="{{AdminAdobeStockSection.recordsFound}}" stepKey="countWithoutModelFilter"/>
3636
<actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForUnlicensedImage">
37-
<argument name="query" value="{{AdobeStockUnlicensedImage.id}}"/>
37+
<argument name="query" value="{{AdobeStockUnlicensedNewImage.id}}"/>
3838
</actionGroup>
3939
<actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
4040
<waitForAjaxLoad stepKey="waitForRelatedImagesToLoad"/>

‎AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3030
</after>
3131
<actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForUnlicensedImage">
32-
<argument name="query" value="{{AdobeStockUnlicensedImage.id}}"/>
32+
<argument name="query" value="{{AdobeStockUnlicensedNewImage.id}}"/>
3333
</actionGroup>
3434
<actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
3535
<waitForAjaxLoad stepKey="waitForRelatedImagesToLoad"/>

0 commit comments

Comments
 (0)