Skip to content

Commit 1957cfb

Browse files
author
Natalia Momotenko
committed
Merge remote-tracking branch 'magento2ce/develop' into develop
2 parents a22f857 + c587bcc commit 1957cfb

File tree

154 files changed

+1837
-1472
lines changed

Some content is hidden

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

154 files changed

+1837
-1472
lines changed

‎CHANGELOG.md

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
0.42.0-beta10
2+
=============
3+
* Framework
4+
* Replaced \Magento\Framework\Model\Exception with LocalizedException
5+
* Replaced obsolete exceptions
6+
* Config components are moved to new Magento_Config module
7+
* Variables components are moved to new Magento_Variable module
8+
* Preferences, shared instance creation and compiled factory accelerated by 3%
9+
* Fixed "HEADERS ALREADY SENT" error when controller action outputs directly
10+
* Setup
11+
* Added ability to install and upgrade components in Setup Tool (CLI)
12+
* Added ability to manage list of modules in Setup Wizard
13+
* Fixed error after "Start Readiness Check" button press in Setup Wizard
14+
* Fixed error with Base URL change after "Previous" button press on Step 4 in Setup Wizard
15+
* Fixed error with HTTPS options related to auto-filled Base URL on Step 3 of Setup Wizard
16+
* Fixed error in "app\design\frontend\Magento\luma\composer.json"
17+
* LESS Compiler
18+
* Added automatic update in "pub/static" of changed "css/js/images" after materialization
19+
* Variable names are renamed to meet Magento Code Standards
20+
* Added client-side LESS files compilation to reduce page load time in developer mode
21+
* Widgets
22+
* Fixed fatal error on page which contain a widget with a condition based on "Category"
23+
* GitHub requests
24+
* [#899](https://github.com/magento/magento2/issues/899) -- When accessing any category - error report generated
25+
* [#986](https://github.com/magento/magento2/pull/986) -- Make it possible to exclude classes (directories) for compilation
26+
* [#1054](https://github.com/magento/magento2/pull/1054) -- Fix typo in MAGE_MODE
27+
128
0.42.0-beta9
229
=============
330
* Framework Improvements:
@@ -30,7 +57,7 @@
3057
* Increased unit test coverage for Magento/Indexer module
3158
* Version number info became accessible at a public URL
3259
* GitHub requests:
33-
* [#1027](https://github.com/magento/magento2/issues/1027) -- Can't add new subctegory
60+
* [#1027](https://github.com/magento/magento2/issues/1027) -- Can't add new subcategory
3461
* [#921](https://github.com/magento/magento2/issues/921) -- Change resource ids from Magento_Adminhtml::* to Magento_Backend
3562

3663
0.42.0-beta8

‎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.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta9",
7-
"magento/module-core": "0.42.0-beta9",
8-
"magento/module-backend": "0.42.0-beta9",
9-
"magento/framework": "0.42.0-beta9",
6+
"magento/module-store": "0.42.0-beta10",
7+
"magento/module-core": "0.42.0-beta10",
8+
"magento/module-backend": "0.42.0-beta10",
9+
"magento/framework": "0.42.0-beta10",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta9",
14+
"version": "0.42.0-beta10",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎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.5.0|~5.6.0",
6-
"magento/module-backend": "0.42.0-beta9",
7-
"magento/framework": "0.42.0-beta9",
6+
"magento/module-backend": "0.42.0-beta10",
7+
"magento/framework": "0.42.0-beta10",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.42.0-beta9",
11+
"version": "0.42.0-beta10",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta9",
7-
"magento/module-directory": "0.42.0-beta9",
8-
"magento/module-core": "0.42.0-beta9",
9-
"magento/module-developer": "0.42.0-beta9",
10-
"magento/module-eav": "0.42.0-beta9",
11-
"magento/module-cron": "0.42.0-beta9",
12-
"magento/module-theme": "0.42.0-beta9",
13-
"magento/module-reports": "0.42.0-beta9",
14-
"magento/module-sales": "0.42.0-beta9",
15-
"magento/module-quote": "0.42.0-beta9",
16-
"magento/module-catalog": "0.42.0-beta9",
17-
"magento/module-user": "0.42.0-beta9",
18-
"magento/module-backup": "0.42.0-beta9",
19-
"magento/module-customer": "0.42.0-beta9",
20-
"magento/module-translation": "0.42.0-beta9",
21-
"magento/module-require-js": "0.42.0-beta9",
22-
"magento/module-config": "0.42.0-beta9",
23-
"magento/framework": "0.42.0-beta9",
6+
"magento/module-store": "0.42.0-beta10",
7+
"magento/module-directory": "0.42.0-beta10",
8+
"magento/module-core": "0.42.0-beta10",
9+
"magento/module-developer": "0.42.0-beta10",
10+
"magento/module-eav": "0.42.0-beta10",
11+
"magento/module-cron": "0.42.0-beta10",
12+
"magento/module-theme": "0.42.0-beta10",
13+
"magento/module-reports": "0.42.0-beta10",
14+
"magento/module-sales": "0.42.0-beta10",
15+
"magento/module-quote": "0.42.0-beta10",
16+
"magento/module-catalog": "0.42.0-beta10",
17+
"magento/module-user": "0.42.0-beta10",
18+
"magento/module-backup": "0.42.0-beta10",
19+
"magento/module-customer": "0.42.0-beta10",
20+
"magento/module-translation": "0.42.0-beta10",
21+
"magento/module-require-js": "0.42.0-beta10",
22+
"magento/module-config": "0.42.0-beta10",
23+
"magento/framework": "0.42.0-beta10",
2424
"magento/magento-composer-installer": "*"
2525
},
2626
"type": "magento2-module",
27-
"version": "0.42.0-beta9",
27+
"version": "0.42.0-beta10",
2828
"license": [
2929
"OSL-3.0",
3030
"AFL-3.0"

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

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

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-config": "0.42.0-beta9",
7-
"magento/module-store": "0.42.0-beta9",
8-
"magento/module-catalog": "0.42.0-beta9",
9-
"magento/module-tax": "0.42.0-beta9",
10-
"magento/module-core": "0.42.0-beta9",
11-
"magento/module-backend": "0.42.0-beta9",
12-
"magento/module-sales": "0.42.0-beta9",
13-
"magento/module-checkout": "0.42.0-beta9",
14-
"magento/module-catalog-inventory": "0.42.0-beta9",
15-
"magento/module-customer": "0.42.0-beta9",
16-
"magento/module-catalog-rule": "0.42.0-beta9",
17-
"magento/module-eav": "0.42.0-beta9",
18-
"magento/module-gift-message": "0.42.0-beta9",
19-
"magento/framework": "0.42.0-beta9",
20-
"magento/module-webapi": "0.42.0-beta9",
21-
"magento/module-quote": "0.42.0-beta9",
6+
"magento/module-config": "0.42.0-beta10",
7+
"magento/module-store": "0.42.0-beta10",
8+
"magento/module-catalog": "0.42.0-beta10",
9+
"magento/module-tax": "0.42.0-beta10",
10+
"magento/module-core": "0.42.0-beta10",
11+
"magento/module-backend": "0.42.0-beta10",
12+
"magento/module-sales": "0.42.0-beta10",
13+
"magento/module-checkout": "0.42.0-beta10",
14+
"magento/module-catalog-inventory": "0.42.0-beta10",
15+
"magento/module-customer": "0.42.0-beta10",
16+
"magento/module-catalog-rule": "0.42.0-beta10",
17+
"magento/module-eav": "0.42.0-beta10",
18+
"magento/module-gift-message": "0.42.0-beta10",
19+
"magento/framework": "0.42.0-beta10",
20+
"magento/module-webapi": "0.42.0-beta10",
21+
"magento/module-quote": "0.42.0-beta10",
2222
"magento/magento-composer-installer": "*"
2323
},
2424
"type": "magento2-module",
25-
"version": "0.42.0-beta9",
25+
"version": "0.42.0-beta10",
2626
"license": [
2727
"OSL-3.0",
2828
"AFL-3.0"

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta9",
7-
"magento/module-customer": "0.42.0-beta9",
8-
"magento/module-checkout": "0.42.0-beta9",
9-
"magento/module-core": "0.42.0-beta9",
10-
"magento/module-backend": "0.42.0-beta9",
11-
"magento/framework": "0.42.0-beta9",
6+
"magento/module-store": "0.42.0-beta10",
7+
"magento/module-customer": "0.42.0-beta10",
8+
"magento/module-checkout": "0.42.0-beta10",
9+
"magento/module-core": "0.42.0-beta10",
10+
"magento/module-backend": "0.42.0-beta10",
11+
"magento/framework": "0.42.0-beta10",
1212
"magento/magento-composer-installer": "*"
1313
},
1414
"type": "magento2-module",
15-
"version": "0.42.0-beta9",
15+
"version": "0.42.0-beta10",
1616
"license": [
1717
"OSL-3.0",
1818
"AFL-3.0"

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

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-config": "0.42.0-beta9",
7-
"magento/module-store": "0.42.0-beta9",
8-
"magento/module-eav": "0.42.0-beta9",
9-
"magento/module-cms": "0.42.0-beta9",
10-
"magento/module-indexer": "0.42.0-beta9",
11-
"magento/module-customer": "0.42.0-beta9",
12-
"magento/module-core": "0.42.0-beta9",
13-
"magento/module-theme": "0.42.0-beta9",
14-
"magento/module-checkout": "0.42.0-beta9",
15-
"magento/module-log": "0.42.0-beta9",
16-
"magento/module-backend": "0.42.0-beta9",
17-
"magento/module-widget": "0.42.0-beta9",
18-
"magento/module-wishlist": "0.42.0-beta9",
19-
"magento/module-tax": "0.42.0-beta9",
20-
"magento/module-msrp": "0.42.0-beta9",
21-
"magento/module-catalog-inventory": "0.42.0-beta9",
22-
"magento/module-directory": "0.42.0-beta9",
23-
"magento/module-catalog-rule": "0.42.0-beta9",
24-
"magento/module-product-alert": "0.42.0-beta9",
25-
"magento/module-url-rewrite": "0.42.0-beta9",
26-
"magento/module-catalog-url-rewrite": "0.42.0-beta9",
27-
"magento/module-page-cache": "0.42.0-beta9",
28-
"magento/module-quote": "0.42.0-beta9",
29-
"magento/framework": "0.42.0-beta9",
6+
"magento/module-config": "0.42.0-beta10",
7+
"magento/module-store": "0.42.0-beta10",
8+
"magento/module-eav": "0.42.0-beta10",
9+
"magento/module-cms": "0.42.0-beta10",
10+
"magento/module-indexer": "0.42.0-beta10",
11+
"magento/module-customer": "0.42.0-beta10",
12+
"magento/module-core": "0.42.0-beta10",
13+
"magento/module-theme": "0.42.0-beta10",
14+
"magento/module-checkout": "0.42.0-beta10",
15+
"magento/module-log": "0.42.0-beta10",
16+
"magento/module-backend": "0.42.0-beta10",
17+
"magento/module-widget": "0.42.0-beta10",
18+
"magento/module-wishlist": "0.42.0-beta10",
19+
"magento/module-tax": "0.42.0-beta10",
20+
"magento/module-msrp": "0.42.0-beta10",
21+
"magento/module-catalog-inventory": "0.42.0-beta10",
22+
"magento/module-directory": "0.42.0-beta10",
23+
"magento/module-catalog-rule": "0.42.0-beta10",
24+
"magento/module-product-alert": "0.42.0-beta10",
25+
"magento/module-url-rewrite": "0.42.0-beta10",
26+
"magento/module-catalog-url-rewrite": "0.42.0-beta10",
27+
"magento/module-page-cache": "0.42.0-beta10",
28+
"magento/module-quote": "0.42.0-beta10",
29+
"magento/framework": "0.42.0-beta10",
3030
"magento/magento-composer-installer": "*"
3131
},
3232
"suggest": {
33-
"magento/module-cookie": "0.42.0-beta9"
33+
"magento/module-cookie": "0.42.0-beta10"
3434
},
3535
"type": "magento2-module",
36-
"version": "0.42.0-beta9",
36+
"version": "0.42.0-beta10",
3737
"license": [
3838
"OSL-3.0",
3939
"AFL-3.0"

‎app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,15 @@ $product = $block->getSaleableItem();
8282
<?php endforeach; ?>
8383
</ul>
8484
<?php if ($msrpShowOnGesture):?>
85-
<script>
86-
require(["jquery", "mage/mage"], function($){
87-
88-
$('.product-info-main').mage('tierPrice', {
89-
inputQty: '#qty',
90-
productForm: '#product_addtocart_form'
91-
});
92-
93-
});
94-
</script>
85+
<script type="text/x-magento-init">
86+
{
87+
".product-info-main": {
88+
"tierPrice": {
89+
"inputQty": "#qty",
90+
"productForm": "#product_addtocart_form"
91+
}
92+
}
93+
}
94+
</script>
9595
<?php endif;?>
9696
<?php endif; ?>

‎app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,20 @@ $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');
1717
<div class="product-addto-links" data-role="add-to-links">
1818
<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
1919
<a href="#"
20-
class="action towishlist"
21-
title="<?php echo __('Add to Wishlist') ?>"
22-
data-post='<?php echo $_wishlistSubmitParams; ?>'
23-
data-action="add-to-wishlist"><span><?php echo __('Add to Wishlist') ?></span></a>
20+
class="action towishlist"
21+
title="<?php echo __('Add to Wishlist') ?>"
22+
data-post='<?php echo $_wishlistSubmitParams; ?>'
23+
data-action="add-to-wishlist"><span><?php echo __('Add to Wishlist') ?></span></a>
2424
<?php endif; ?>
2525
<a href="#" data-post='<?php echo $compareHelper->getPostDataParams($_product);?>'
26-
data-role="add-to-links"
27-
title="<?php echo __('Add to Compare') ?>"
28-
class="action tocompare"><span><?php echo __('Add to Compare') ?></span></a>
26+
data-role="add-to-links"
27+
title="<?php echo __('Add to Compare') ?>"
28+
class="action tocompare"><span><?php echo __('Add to Compare') ?></span></a>
2929
</div>
30-
<script>
31-
require([
32-
"jquery",
33-
"mage/mage"
34-
], function(jQuery){
35-
jQuery('body').mage('addToWishlist',
36-
<?php echo $this->helper('Magento\Core\Helper\Data')->jsonEncode($block->getWishlistOptions())?>
37-
);
38-
});
30+
<script type="text/x-magento-init">
31+
{
32+
"body": {
33+
"addToWishlist": <?php echo $this->helper('Magento\Core\Helper\Data')->jsonEncode($block->getWishlistOptions())?>
34+
}
35+
}
3936
</script>

0 commit comments

Comments
 (0)