Skip to content

Commit d294739

Browse files
dkvashninbaydkvashninbay
committed
Merge remote-tracking branch 'main_ce/develop' into static_tests
Conflicts: app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php app/code/Magento/Checkout/Controller/Onepage.php app/code/Magento/Checkout/Model/Cart.php app/code/Magento/Checkout/Model/Type/Onepage.php app/code/Magento/Quote/Model/Quote.php app/code/Magento/Quote/Model/Quote/Address.php app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php app/code/Magento/Quote/Model/Quote/Item.php app/code/Magento/Quote/Model/Resource/Quote.php app/code/Magento/Sales/Model/Convert/Quote.php app/code/Magento/Sales/Model/Service/Quote.php dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt dev/tests/unit/testsuite/Magento/Quote/Model/Observer/Backend/CustomerQuoteTest.php dev/tests/unit/testsuite/Magento/Quote/Model/Observer/Frontend/Quote/Address/CollectTotalsTest.php dev/tests/unit/testsuite/Magento/Quote/Model/Quote/AddressTest.php dev/tests/unit/testsuite/Magento/Quote/Model/Quote/Item/CompareTest.php dev/tests/unit/testsuite/Magento/Quote/Model/Quote/ItemTest.php dev/tests/unit/testsuite/Magento/Quote/Model/QuoteTest.php
2 parents 10400b8 + 1bba5fe commit d294739

File tree

1,863 files changed

+19004
-17688
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,863 files changed

+19004
-17688
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ atlassian*
3232
/pub/media/theme/*
3333
/pub/media/theme_customization/*
3434
!/pub/media/theme_customization/.htaccess
35+
/pub/media/wysiwyg/*
36+
!/pub/media/wysiwyg/.htaccess
3537
/pub/media/tmp/*
3638
!/pub/media/tmp/.htaccess
3739
/pub/static/*

‎CHANGELOG.md

Lines changed: 139 additions & 89 deletions
Large diffs are not rendered by default.

‎COPYING.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
22

33
http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
4-
Please see <insert file name of the OSL license> for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
4+
Please see LICENSE.txt for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
55

6-
Subject to Licensee�s payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
6+
Subject to Licensee's payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
77
Please see <insert file name of the MEE license> for the full text of the MEE License or visit http://magento.com/legal/terms/enterprise.

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta3",
7-
"magento/module-core": "0.42.0-beta3",
8-
"magento/module-backend": "0.42.0-beta3",
9-
"magento/framework": "0.42.0-beta3",
6+
"magento/module-store": "0.42.0-beta4",
7+
"magento/module-core": "0.42.0-beta4",
8+
"magento/module-backend": "0.42.0-beta4",
9+
"magento/framework": "0.42.0-beta4",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta3",
14+
"version": "0.42.0-beta4",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<?php endforeach;?>
1818
</ul>
1919
</div>
20-
<script type="text/javascript">
20+
<script>
2121
require([
2222
"jquery",
2323
"jquery/ui"

‎app/code/Magento/Authorization/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.42.0-beta3",
7-
"magento/framework": "0.42.0-beta3",
6+
"magento/module-backend": "0.42.0-beta4",
7+
"magento/framework": "0.42.0-beta4",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.42.0-beta3",
11+
"version": "0.42.0-beta4",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Backend/Block/Widget/Form/Container.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ public function getFormHtml()
179179
public function getFormInitScripts()
180180
{
181181
if (!empty($this->_formInitScripts) && is_array($this->_formInitScripts)) {
182-
return '<script type="text/javascript">' . implode("\n", $this->_formInitScripts) . '</script>';
182+
return '<script>' . implode("\n", $this->_formInitScripts) . '</script>';
183183
}
184184
return '';
185185
}
@@ -190,7 +190,7 @@ public function getFormInitScripts()
190190
public function getFormScripts()
191191
{
192192
if (!empty($this->_formScripts) && is_array($this->_formScripts)) {
193-
return '<script type="text/javascript">' . implode("\n", $this->_formScripts) . '</script>';
193+
return '<script>' . implode("\n", $this->_formScripts) . '</script>';
194194
}
195195
return '';
196196
}

‎app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ protected function _toHtml()
120120
if (!$this->_depends) {
121121
return '';
122122
}
123-
return '<script type="text/javascript">
123+
return '<script>
124124
require(["mage/adminhtml/form"], function(){
125125
new FormElementDependenceController(' .
126126
$this->_getDependsJson() .

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public function getHtml()
8989
' value="' .
9090
$this->_localeResolver->getLocaleCode() .
9191
'"/>';
92-
$html .= '<script type="text/javascript">
92+
$html .= '<script>
9393
require(["jquery", "mage/calendar"], function($){
9494
$("#' .
9595
$htmlId .

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public function getHtml()
133133
) . '/>' . '</div></div>';
134134
$html .= '<input type="hidden" name="' . $this->_getHtmlName() . '[locale]"' . ' value="'
135135
. $this->_localeResolver->getLocaleCode() . '"/>';
136-
$html .= '<script type="text/javascript">
136+
$html .= '<script>
137137
require(["jquery", "mage/calendar"],function($){
138138
$("#' . $htmlId . '_range").dateRange({
139139
dateFormat: "' . $format . '",

0 commit comments

Comments
 (0)