Skip to content

Commit 0349bd6

Browse files
author
Bogdan Plieshka
committed
Merge remote-tracking branch 'origin/develop' into UI
2 parents e4371cb + 685df6f commit 0349bd6

File tree

313 files changed

+8130
-10347
lines changed

Some content is hidden

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

313 files changed

+8130
-10347
lines changed

‎CHANGELOG.md

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,55 @@
1+
0.42.0-beta5
2+
=============
3+
* UI improvements:
4+
* Updated the design of Enable Cookies CMS page
5+
* Implemented UI improvements for Widgets
6+
* Fixed the "Help Us to Keep Magento Healthy Report All Bugs (ver. #)" link Magento Admin
7+
* Various UI improvements
8+
* Various improvements:
9+
* Implemented Sales Quote as a standalone Magento module
10+
* Performed custom EAV entities code and DB tables cleanup
11+
* Eliminating remnants of the Core module:
12+
* Moved Application Emulation from the Magento_Core module to the Magento_Store module
13+
* Moved Validator Factory from the Magento_Core module to the Magento Framework
14+
* Added static integrity test for composer.json files
15+
* Added PHPMD and PHPCS annotations to the codebase
16+
* Tests improvements:
17+
* Added MVP tag to the functional tests
18+
* Created acceptance functional test suite
19+
* Replaced end-to-end tests for url rewrite creation, CMS page creation, category creation, review creation, customer frontend creation, and tax rule creation with injectable tests
20+
* Automated test cases for downloadable products with taxes
21+
* Fixed bugs:
22+
* Fixed an issue where the Discounts and Coupons RSS Feed had incorrect title
23+
* Fixed an issue where a wrong special price expiration date was displayed in RSS
24+
* Fixed an issue in the Import functionality where imported files disappeared after the Check Data operation
25+
* Fixed an issue where the Unsubscribe link in the Newsletter was broken
26+
* Fixed an issue where stock status changed incorrectly after import
27+
* Fixed an issue where selected filters and exclude did not work during Export
28+
* Fixed an issue where tax details order was different on order/invoice/refund create and view pages (
29+
* Fixed a typo in the getCalculationAlgorithm public function
30+
* Fixed an issue where the incorrect value of Subtotal Including Tax was displayed in invoices
31+
* Fixed an issue where tax details were not displayed on a new order
32+
* Improved pricing performance using caching
33+
* Fixed an issue where CsvImportHandler tests still referring to links from Tax module instead of TaxImportExport module
34+
* Fixed an issue where an exception was thrown instead of 404 if altering the url for a product with required configuration on the storefront
35+
* Fixed an issue where the title of successfully placed order page (was empty
36+
* Fixed an issue where certain fields were not disabled by default on the website scope in System configuration as expected
37+
* Fixed an issue where third party interfaces were not supported by single-tenant compiler
38+
* Eliminated the 'protocol' parameter from the ReadInterface and WriteInterface
39+
* GitHub requests:
40+
* [#979](https://github.com/magento/magento2/pull/979) -- Adding OSL license file name
41+
* [#978](https://github.com/magento/magento2/pull/978) -- Added ignore rule for media assets in wysiwyg directory
42+
* [#877](https://github.com/magento/magento2/pull/877) -- Made Topmenu HTML Editable
43+
* [#906](https://github.com/magento/magento2/pull/906) -- Add tests for View\Layout\Reader\Block and slight refactoring
44+
* [#682](https://github.com/magento/magento2/issues/682) -- \Magento\Framework\Pricing\PriceCurrencyInterface depends on Magento application code
45+
* [#581](https://github.com/magento/magento2/issues/581) -- About ByPercent.php under different currencies
46+
* [#964](https://github.com/magento/magento2/pull/964) -- Improving documentation for jMeter performance tests
47+
* [#871](https://github.com/magento/magento2/issues/871) -- Replace Symfony2/Yaml in composer
48+
* [#990](https://github.com/magento/magento2/pull/990) -- add @see annotation before class to make it recognizable by IDE
49+
* [#988](https://github.com/magento/magento2/pull/988) -- Prevent Varnish from creating cache variations of static files
50+
* Framework improvements:
51+
* Improved unit and integration tests coverage
52+
153
0.42.0-beta4
254
=============
355
* Various improvements:

‎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-beta4",
7-
"magento/module-core": "0.42.0-beta4",
8-
"magento/module-backend": "0.42.0-beta4",
9-
"magento/framework": "0.42.0-beta4",
6+
"magento/module-store": "0.42.0-beta5",
7+
"magento/module-core": "0.42.0-beta5",
8+
"magento/module-backend": "0.42.0-beta5",
9+
"magento/framework": "0.42.0-beta5",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta4",
14+
"version": "0.42.0-beta5",
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.4.11|~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.42.0-beta4",
7-
"magento/framework": "0.42.0-beta4",
6+
"magento/module-backend": "0.42.0-beta5",
7+
"magento/framework": "0.42.0-beta5",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.42.0-beta4",
11+
"version": "0.42.0-beta5",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

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

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

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

Lines changed: 6 additions & 6 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-beta4",
7-
"magento/module-core": "0.42.0-beta4",
8-
"magento/module-backend": "0.42.0-beta4",
9-
"magento/module-cron": "0.42.0-beta4",
10-
"magento/framework": "0.42.0-beta4",
6+
"magento/module-store": "0.42.0-beta5",
7+
"magento/module-core": "0.42.0-beta5",
8+
"magento/module-backend": "0.42.0-beta5",
9+
"magento/module-cron": "0.42.0-beta5",
10+
"magento/framework": "0.42.0-beta5",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta4",
14+
"version": "0.42.0-beta5",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/Bundle/Model/Plugin/QuoteItem.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function aroundConvert(
2323
\Magento\Quote\Model\Quote\Item\ToOrderItem $subject,
2424
Closure $proceed,
2525
\Magento\Quote\Model\Quote\Item\AbstractItem $item,
26-
$additional
26+
$additional = []
2727
) {
2828
/** @var $orderItem \Magento\Sales\Model\Order\Item */
2929
$orderItem = $proceed($item, $additional);

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta4",
7-
"magento/module-catalog": "0.42.0-beta4",
8-
"magento/module-tax": "0.42.0-beta4",
9-
"magento/module-core": "0.42.0-beta4",
10-
"magento/module-backend": "0.42.0-beta4",
11-
"magento/module-sales": "0.42.0-beta4",
12-
"magento/module-checkout": "0.42.0-beta4",
13-
"magento/module-catalog-inventory": "0.42.0-beta4",
14-
"magento/module-customer": "0.42.0-beta4",
15-
"magento/module-catalog-rule": "0.42.0-beta4",
16-
"magento/module-eav": "0.42.0-beta4",
17-
"magento/module-gift-message": "0.42.0-beta4",
18-
"magento/framework": "0.42.0-beta4",
19-
"magento/module-webapi": "0.42.0-beta4",
20-
"magento/module-quote": "0.42.0-beta4",
6+
"magento/module-store": "0.42.0-beta5",
7+
"magento/module-catalog": "0.42.0-beta5",
8+
"magento/module-tax": "0.42.0-beta5",
9+
"magento/module-core": "0.42.0-beta5",
10+
"magento/module-backend": "0.42.0-beta5",
11+
"magento/module-sales": "0.42.0-beta5",
12+
"magento/module-checkout": "0.42.0-beta5",
13+
"magento/module-catalog-inventory": "0.42.0-beta5",
14+
"magento/module-customer": "0.42.0-beta5",
15+
"magento/module-catalog-rule": "0.42.0-beta5",
16+
"magento/module-eav": "0.42.0-beta5",
17+
"magento/module-gift-message": "0.42.0-beta5",
18+
"magento/framework": "0.42.0-beta5",
19+
"magento/module-webapi": "0.42.0-beta5",
20+
"magento/module-quote": "0.42.0-beta5",
2121
"magento/magento-composer-installer": "*"
2222
},
2323
"type": "magento2-module",
24-
"version": "0.42.0-beta4",
24+
"version": "0.42.0-beta5",
2525
"license": [
2626
"OSL-3.0",
2727
"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.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta4",
7-
"magento/module-customer": "0.42.0-beta4",
8-
"magento/module-checkout": "0.42.0-beta4",
9-
"magento/module-core": "0.42.0-beta4",
10-
"magento/module-backend": "0.42.0-beta4",
11-
"magento/framework": "0.42.0-beta4",
6+
"magento/module-store": "0.42.0-beta5",
7+
"magento/module-customer": "0.42.0-beta5",
8+
"magento/module-checkout": "0.42.0-beta5",
9+
"magento/module-core": "0.42.0-beta5",
10+
"magento/module-backend": "0.42.0-beta5",
11+
"magento/framework": "0.42.0-beta5",
1212
"magento/magento-composer-installer": "*"
1313
},
1414
"type": "magento2-module",
15-
"version": "0.42.0-beta4",
15+
"version": "0.42.0-beta5",
1616
"license": [
1717
"OSL-3.0",
1818
"AFL-3.0"

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

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

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
<script>
4848
require([
4949
"jquery",
50-
"mage/mage"
50+
"mage/mage",
51+
"Magento_Catalog/product/view/validation"
5152
], function($){
5253
$('#product_addtocart_form').mage('validation', {
5354
radioCheckboxClosest: '.nested'

0 commit comments

Comments
 (0)