Skip to content

Commit 9f624e2

Browse files
author
Stanislav Idolov
authored
Merge branch '2.3-develop' into 2.3-develop-PR-port-16849
2 parents b428aab + 232eec2 commit 9f624e2

File tree

245 files changed

+11748
-8158
lines changed

Some content is hidden

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

245 files changed

+11748
-8158
lines changed

‎app/code/Magento/AdminNotification/etc/adminhtml/menu.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
99
<menu>
10-
<add id="Magento_AdminNotification::system_adminnotification" title="Notifications" translate="title" module="Magento_AdminNotification" sortOrder="10" parent="Magento_Backend::system_other_settings" action="adminhtml/notification" resource="Magento_AdminNotification::adminnotification"/>
10+
<add id="Magento_AdminNotification::system_adminnotification" title="Notifications" translate="title" module="Magento_AdminNotification" sortOrder="10" parent="Magento_Backend::system_other_settings" action="adminhtml/notification" resource="Magento_AdminNotification::adminnotification"/>
1111
</menu>
1212
</config>

‎app/code/Magento/AdminNotification/etc/db_schema_whitelist.json

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
{
2-
"adminnotification_inbox": {
3-
"column": {
4-
"notification_id": true,
5-
"severity": true,
6-
"date_added": true,
7-
"title": true,
8-
"description": true,
9-
"url": true,
10-
"is_read": true,
11-
"is_remove": true
2+
"adminnotification_inbox": {
3+
"column": {
4+
"notification_id": true,
5+
"severity": true,
6+
"date_added": true,
7+
"title": true,
8+
"description": true,
9+
"url": true,
10+
"is_read": true,
11+
"is_remove": true
12+
},
13+
"index": {
14+
"ADMINNOTIFICATION_INBOX_SEVERITY": true,
15+
"ADMINNOTIFICATION_INBOX_IS_READ": true,
16+
"ADMINNOTIFICATION_INBOX_IS_REMOVE": true
17+
},
18+
"constraint": {
19+
"PRIMARY": true
20+
}
1221
},
13-
"index": {
14-
"ADMINNOTIFICATION_INBOX_SEVERITY": true,
15-
"ADMINNOTIFICATION_INBOX_IS_READ": true,
16-
"ADMINNOTIFICATION_INBOX_IS_REMOVE": true
17-
},
18-
"constraint": {
19-
"PRIMARY": true
20-
}
21-
},
22-
"admin_system_messages": {
23-
"column": {
24-
"identity": true,
25-
"severity": true,
26-
"created_at": true
27-
},
28-
"constraint": {
29-
"PRIMARY": true
22+
"admin_system_messages": {
23+
"column": {
24+
"identity": true,
25+
"severity": true,
26+
"created_at": true
27+
},
28+
"constraint": {
29+
"PRIMARY": true
30+
}
3031
}
31-
}
3232
}

‎app/code/Magento/AdvancedSearch/etc/db_schema_whitelist.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"catalogsearch_recommendations": {
3-
"column": {
4-
"id": true,
5-
"query_id": true,
6-
"relation_id": true
7-
},
8-
"constraint": {
9-
"PRIMARY": true,
10-
"CATALOGSEARCH_RECOMMENDATIONS_QUERY_ID_SEARCH_QUERY_QUERY_ID": true,
11-
"CATALOGSEARCH_RECOMMENDATIONS_RELATION_ID_SEARCH_QUERY_QUERY_ID": true
2+
"catalogsearch_recommendations": {
3+
"column": {
4+
"id": true,
5+
"query_id": true,
6+
"relation_id": true
7+
},
8+
"constraint": {
9+
"PRIMARY": true,
10+
"CATALOGSEARCH_RECOMMENDATIONS_QUERY_ID_SEARCH_QUERY_QUERY_ID": true,
11+
"CATALOGSEARCH_RECOMMENDATIONS_RELATION_ID_SEARCH_QUERY_QUERY_ID": true
12+
}
1213
}
13-
}
1414
}

‎app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
11
{
2-
"magento_bulk": {
3-
"column": {
4-
"id": true,
5-
"uuid": true,
6-
"user_id": true,
7-
"description": true,
8-
"operation_count": true,
9-
"start_time": true
2+
"magento_bulk": {
3+
"column": {
4+
"id": true,
5+
"uuid": true,
6+
"user_id": true,
7+
"description": true,
8+
"operation_count": true,
9+
"start_time": true
10+
},
11+
"constraint": {
12+
"PRIMARY": true,
13+
"MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID": true,
14+
"MAGENTO_BULK_UUID": true
15+
}
1016
},
11-
"constraint": {
12-
"PRIMARY": true,
13-
"MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID": true,
14-
"MAGENTO_BULK_UUID": true
15-
}
16-
},
17-
"magento_operation": {
18-
"column": {
19-
"id": true,
20-
"bulk_uuid": true,
21-
"topic_name": true,
22-
"serialized_data": true,
23-
"result_serialized_data": true,
24-
"status": true,
25-
"error_code": true,
26-
"result_message": true
27-
},
28-
"index": {
29-
"MAGENTO_OPERATION_BULK_UUID_ERROR_CODE": true
30-
},
31-
"constraint": {
32-
"PRIMARY": true,
33-
"MAGENTO_OPERATION_BULK_UUID_MAGENTO_BULK_UUID": true
34-
}
35-
},
36-
"magento_acknowledged_bulk": {
37-
"column": {
38-
"id": true,
39-
"bulk_uuid": true
17+
"magento_operation": {
18+
"column": {
19+
"id": true,
20+
"bulk_uuid": true,
21+
"topic_name": true,
22+
"serialized_data": true,
23+
"result_serialized_data": true,
24+
"status": true,
25+
"error_code": true,
26+
"result_message": true
27+
},
28+
"index": {
29+
"MAGENTO_OPERATION_BULK_UUID_ERROR_CODE": true
30+
},
31+
"constraint": {
32+
"PRIMARY": true,
33+
"MAGENTO_OPERATION_BULK_UUID_MAGENTO_BULK_UUID": true
34+
}
4035
},
41-
"constraint": {
42-
"PRIMARY": true,
43-
"MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID_MAGENTO_BULK_UUID": true,
44-
"MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID": true
36+
"magento_acknowledged_bulk": {
37+
"column": {
38+
"id": true,
39+
"bulk_uuid": true
40+
},
41+
"constraint": {
42+
"PRIMARY": true,
43+
"MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID_MAGENTO_BULK_UUID": true,
44+
"MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID": true
45+
}
4546
}
46-
}
4747
}

‎app/code/Magento/Authorization/etc/db_schema_whitelist.json

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
{
2-
"authorization_role": {
3-
"column": {
4-
"role_id": true,
5-
"parent_id": true,
6-
"tree_level": true,
7-
"sort_order": true,
8-
"role_type": true,
9-
"user_id": true,
10-
"user_type": true,
11-
"role_name": true
2+
"authorization_role": {
3+
"column": {
4+
"role_id": true,
5+
"parent_id": true,
6+
"tree_level": true,
7+
"sort_order": true,
8+
"role_type": true,
9+
"user_id": true,
10+
"user_type": true,
11+
"role_name": true
12+
},
13+
"index": {
14+
"AUTHORIZATION_ROLE_PARENT_ID_SORT_ORDER": true,
15+
"AUTHORIZATION_ROLE_TREE_LEVEL": true
16+
},
17+
"constraint": {
18+
"PRIMARY": true
19+
}
1220
},
13-
"index": {
14-
"AUTHORIZATION_ROLE_PARENT_ID_SORT_ORDER": true,
15-
"AUTHORIZATION_ROLE_TREE_LEVEL": true
16-
},
17-
"constraint": {
18-
"PRIMARY": true
19-
}
20-
},
21-
"authorization_rule": {
22-
"column": {
23-
"rule_id": true,
24-
"role_id": true,
25-
"resource_id": true,
26-
"privileges": true,
27-
"permission": true
28-
},
29-
"index": {
30-
"AUTHORIZATION_RULE_RESOURCE_ID_ROLE_ID": true,
31-
"AUTHORIZATION_RULE_ROLE_ID_RESOURCE_ID": true
32-
},
33-
"constraint": {
34-
"PRIMARY": true,
35-
"AUTHORIZATION_RULE_ROLE_ID_AUTHORIZATION_ROLE_ROLE_ID": true
21+
"authorization_rule": {
22+
"column": {
23+
"rule_id": true,
24+
"role_id": true,
25+
"resource_id": true,
26+
"privileges": true,
27+
"permission": true
28+
},
29+
"index": {
30+
"AUTHORIZATION_RULE_RESOURCE_ID_ROLE_ID": true,
31+
"AUTHORIZATION_RULE_ROLE_ID_RESOURCE_ID": true
32+
},
33+
"constraint": {
34+
"PRIMARY": true,
35+
"AUTHORIZATION_RULE_ROLE_ID_AUTHORIZATION_ROLE_ROLE_ID": true
36+
}
3637
}
37-
}
3838
}

‎app/code/Magento/Braintree/etc/acl.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<resource id="Magento_Backend::admin">
1212
<resource id="Magento_Reports::report">
1313
<resource id="Magento_Reports::salesroot">
14-
<resource id="Magento_Braintree::settlement_report" title="Braintree Settlement" sortOrder="80" />
14+
<resource id="Magento_Braintree::settlement_report" title="Braintree Settlement" translate="title" sortOrder="80" />
1515
</resource>
1616
</resource>
1717
<resource id="Magento_Sales::sales">

‎app/code/Magento/Braintree/etc/adminhtml/menu.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<add
1111
id="Magento_Braintree::settlement_report"
1212
title="Braintree Settlement"
13+
translate="title"
1314
module="Magento_Braintree"
1415
sortOrder="80"
1516
parent="Magento_Reports::report_salesroot"

‎app/code/Magento/Braintree/i18n/en_US.csv

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,4 +190,5 @@ Currency,Currency
190190
"Partial settlements are not supported by this processor.","Partial settlements are not supported by this processor."
191191
"Transaction can not be voided if status of a PayPal partial settlement child transaction is settlement_pending.","Transaction can not be voided if status of a PayPal partial settlement child transaction is settlement_pending."
192192
"Too many concurrent attempts to refund this transaction. Try again later.","Too many concurrent attempts to refund this transaction. Try again later."
193-
"Too many concurrent attempts to void this transaction. Try again later.","Too many concurrent attempts to void this transaction. Try again later."
193+
"Too many concurrent attempts to void this transaction. Try again later.","Too many concurrent attempts to void this transaction. Try again later."
194+
"Braintree Settlement","Braintree Settlement"

0 commit comments

Comments
 (0)