Skip to content

Commit bac984a

Browse files
okolesnykokolesnyk
committed
Merge branch '2.3-develop' of github.com:magento/magento2ce into community-tests-migration-pr
2 parents 02da1ef + fc387f4 commit bac984a

File tree

317 files changed

+8270
-1575
lines changed

Some content is hidden

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

317 files changed

+8270
-1575
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Please see LICENSE_EE.txt for the full text of the MEE License or visit https://
6464

6565
## Community Engineering Slack
6666

67-
To connect with Magento and the Community, join us on the [Magento Community Engineering Slack](https://magentocommeng.slack.com). If you are interested in joining Slack, or a specific channel, send us a request at [engcom@adobe.com](mailto:engcom@adobe.com) or [self signup](https://tinyurl.com/engcom-slack).
67+
To connect with Magento and the Community, join us on the [Magento Community Engineering Slack](https://magentocommeng.slack.com). If you are interested in joining Slack, or a specific channel, send us a request at [engcom@adobe.com](mailto:engcom@adobe.com) or [self signup](https://opensource.magento.com/slack).
6868

6969

7070
We have channels for each project. These channels are recommended for new members:

‎app/code/Magento/Authorizenet/view/adminhtml/web/js/direct-post.js

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,11 @@
33
* See COPYING.txt for license details.
44
*/
55

6-
(function (factory) {
7-
if (typeof define === 'function' && define.amd) {
8-
define([
9-
'jquery',
10-
'mage/backend/validation',
11-
'prototype'
12-
], factory);
13-
} else {
14-
factory(jQuery);
15-
}
16-
}(function (jQuery) {
17-
6+
define([
7+
'jquery',
8+
'mage/backend/validation',
9+
'prototype'
10+
], function (jQuery) {
1811
window.directPost = Class.create();
1912
directPost.prototype = {
2013
initialize: function (methodCode, iframeId, controller, orderSaveUrl, cgiUrl, nativeAction) {
@@ -349,4 +342,4 @@
349342
}
350343
}
351344
};
352-
}));
345+
});

‎app/code/Magento/Backend/etc/adminhtml/system.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -482,22 +482,22 @@
482482
<field id="base_url" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
483483
<label>Base URL</label>
484484
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
485-
<comment>Specify URL or {{base_url}} placeholder.</comment>
485+
<comment><![CDATA[Specify URL or {{base_url}} placeholder.]]></comment>
486486
</field>
487487
<field id="base_link_url" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
488488
<label>Base Link URL</label>
489489
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
490-
<comment>May start with {{unsecure_base_url}} placeholder.</comment>
490+
<comment><![CDATA[May start with {{unsecure_base_url}} placeholder.]]></comment>
491491
</field>
492492
<field id="base_static_url" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
493493
<label>Base URL for Static View Files</label>
494494
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
495-
<comment>May be empty or start with {{unsecure_base_url}} placeholder.</comment>
495+
<comment><![CDATA[May be empty or start with {{unsecure_base_url}} placeholder.]]></comment>
496496
</field>
497497
<field id="base_media_url" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
498498
<label>Base URL for User Media Files</label>
499499
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
500-
<comment>May be empty or start with {{unsecure_base_url}} placeholder.</comment>
500+
<comment><![CDATA[May be empty or start with {{unsecure_base_url}} placeholder.]]></comment>
501501
</field>
502502
</group>
503503
<group id="secure" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -506,22 +506,22 @@
506506
<field id="base_url" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
507507
<label>Secure Base URL</label>
508508
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
509-
<comment>Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.</comment>
509+
<comment><![CDATA[Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.]]></comment>
510510
</field>
511511
<field id="base_link_url" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
512512
<label>Secure Base Link URL</label>
513513
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
514-
<comment>May start with {{secure_base_url}} or {{unsecure_base_url}} placeholder.</comment>
514+
<comment><![CDATA[May start with {{secure_base_url}} or {{unsecure_base_url}} placeholder.]]></comment>
515515
</field>
516516
<field id="base_static_url" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
517517
<label>Secure Base URL for Static View Files</label>
518518
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
519-
<comment>May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.</comment>
519+
<comment><![CDATA[May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.]]></comment>
520520
</field>
521521
<field id="base_media_url" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
522522
<label>Secure Base URL for User Media Files</label>
523523
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
524-
<comment>May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.</comment>
524+
<comment><![CDATA[May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.]]></comment>
525525
</field>
526526
<field id="use_in_frontend" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
527527
<label>Use Secure URLs on Storefront</label>

‎app/code/Magento/Backend/view/adminhtml/web/js/translate.js

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,10 @@
44
*/
55

66
/* eslint-disable strict */
7-
(function (factory) {
8-
if (typeof define === 'function' && define.amd) {
9-
define([
10-
'jquery',
11-
'mage/mage'
12-
], factory);
13-
} else {
14-
factory(jQuery);
15-
}
16-
}(function ($) {
7+
define([
8+
'jquery',
9+
'mage/mage'
10+
], function ($) {
1711
$.extend(true, $, {
1812
mage: {
1913
translate: (function () {
@@ -51,4 +45,4 @@
5145
$.mage.__ = $.proxy($.mage.translate.translate, $.mage.translate);
5246

5347
return $.mage.__;
54-
}));
48+
});

‎app/code/Magento/Bundle/Setup/Patch/Schema/ChangeTmpTablesEngine.php

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

‎app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,20 @@
6161
<requiredEntity type="custom_attribute">CustomAttributeDynamicPrice</requiredEntity>
6262
<requiredEntity type="custom_attribute">CustomAttributePriceView</requiredEntity>
6363
</entity>
64+
<entity name="ApiBundleProductUnderscoredSku" type="product2">
65+
<data key="name" unique="suffix">Api Bundle Product</data>
66+
<data key="sku" unique="suffix">api_bundle_product</data>
67+
<data key="type_id">bundle</data>
68+
<data key="attribute_set_id">4</data>
69+
<data key="visibility">4</data>
70+
<data key="status">1</data>
71+
<data key="urlKey" unique="suffix">api-bundle-product</data>
72+
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
73+
<requiredEntity type="custom_attribute">ApiProductDescription</requiredEntity>
74+
<requiredEntity type="custom_attribute">ApiProductShortDescription</requiredEntity>
75+
<requiredEntity type="custom_attribute">CustomAttributeDynamicPrice</requiredEntity>
76+
<requiredEntity type="custom_attribute">CustomAttributePriceView</requiredEntity>
77+
</entity>
6478
<entity name="ApiBundleProductPriceViewRange" type="product2">
6579
<data key="name" unique="suffix">Api Bundle Product</data>
6680
<data key="sku" unique="suffix">api-bundle-product</data>

0 commit comments

Comments
 (0)