Skip to content

Commit 46412de

Browse files
committed
AC-461: Add ReCaptcha support to coupon code
* Merge branch '2.4-develop' into AC-461
2 parents f55651c + e8c31f5 commit 46412de

File tree

1,601 files changed

+61000
-45519
lines changed

Some content is hidden

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

1,601 files changed

+61000
-45519
lines changed

app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminCheckAnalyticsTrackingTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<description value="AdminAnalytics Check Tracking."/>
1616
<severity value="MINOR"/>
1717
<testCaseId value="MC-36869"/>
18+
<group value="pr_exclude"/>
1819
</annotations>
1920
<before>
2021
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

app/code/Magento/AdminAnalytics/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"sort-packages": true
66
},
77
"require": {
8-
"php": "~7.4.0||~8.0.0",
8+
"php": "~7.4.0||~8.0.0||~8.1.0",
99
"magento/framework": "*",
1010
"magento/module-backend": "*",
1111
"magento/module-config": "*",

app/code/Magento/AdminNotification/Model/InboxInterface.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,20 @@ interface InboxInterface
1818
*
1919
* @param int|null $severity
2020
* @return array|string|null
21-
* @api
2221
*/
2322
public function getSeverities($severity = null);
2423

2524
/**
2625
* Retrieve Latest Notice
2726
*
2827
* @return $this
29-
* @api
3028
*/
3129
public function loadLatestNotice();
3230

3331
/**
3432
* Retrieve notice statuses
3533
*
3634
* @return array
37-
* @api
3835
*/
3936
public function getNoticeStatus();
4037
}

app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationNavigateMenuTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<testCaseId value="MC-14125"/>
1919
<group value="menu"/>
2020
<group value="mtf_migrated"/>
21+
<group value="pr_exclude"/>
2122
</annotations>
2223
<before>
2324
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

app/code/Magento/AdminNotification/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"sort-packages": true
66
},
77
"require": {
8-
"php": "~7.4.0||~8.0.0",
8+
"php": "~7.4.0||~8.0.0||~8.1.0",
99
"lib-libxml": "*",
1010
"magento/framework": "*",
1111
"magento/module-backend": "*",

app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ define([
6969
}
7070
});
7171

72-
$(document).ready(function () {
72+
$(function () {
7373
$('#system_messages .message-system-short .error').on('click', function () {
7474
$('#message-system-all').systemMessageDialog('openModal', 1);
7575
});

app/code/Magento/AdvancedPricingImportExport/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"sort-packages": true
66
},
77
"require": {
8-
"php": "~7.4.0||~8.0.0",
8+
"php": "~7.4.0||~8.0.0||~8.1.0",
99
"magento/framework": "*",
1010
"magento/module-catalog": "*",
1111
"magento/module-catalog-import-export": "*",

app/code/Magento/AdvancedSearch/Test/Mftf/Test/AdminAddSearchTermTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<description value="Admin should be able to create a new search term using search terms grid"/>
1717
<severity value="CRITICAL"/>
1818
<group value="AdvancedSearch"/>
19+
<group value="pr_exclude"/>
1920
</annotations>
2021
<before>
2122
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/AdvancedSearch/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"magento/module-customer": "*",
1414
"magento/module-search": "*",
1515
"magento/module-store": "*",
16-
"php": "~7.4.0||~8.0.0"
16+
"php": "~7.4.0||~8.0.0||~8.1.0"
1717
},
1818
"type": "magento2-module",
1919
"license": [

app/code/Magento/AdvancedSearch/view/adminhtml/web/js/testconnection.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ define([
4444
fieldToCheck = this.options.fieldToCheck || 'success';
4545

4646
element.removeClass('success').addClass('fail');
47-
$.each($.parseJSON(this.options.fieldMapping), function (key, el) {
47+
$.each(JSON.parse(this.options.fieldMapping), function (key, el) {
4848
params[key] = $('#' + el).val();
4949
});
5050
$.ajax({

0 commit comments

Comments
 (0)