Skip to content

Commit 199391f

Browse files
guz-antonguz-anton
committed
Merge branch 'develop' into PR
2 parents 61505a2 + 28f4987 commit 199391f

File tree

102 files changed

+820
-800
lines changed

Some content is hidden

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

102 files changed

+820
-800
lines changed

‎CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
0.74.0-beta7
2+
=============
3+
* Framework improvements
4+
* Exceptions are caught and logged before reaching the Phrase::__toString() method
5+
* Refactored controller actions in the Checkout area
6+
* Refactored controller actions in the Tax area
7+
* Implemented new look & feel for the Edit Order page (View/Edit Order)
8+
* Replaced the end-to-end test for Onepage Checkout with online shipment methods with the scenario test
9+
* Fixed bugs
10+
* Fixed an issue where a success message was absent when adding a product with options from Wishlist to Shopping Cart
11+
* Fixed an issue where an exception was thrown when trying to sort Customer Groups by Tax Class
12+
* Fixed an issue where the background color changed to the “on focus” state when clicking the Admin Menu logo
13+
* Fixed an issue with Mini Shopping Cart containing extra empty space
14+
* GitHub issues
15+
* [#1173] (https://github.com/magento/magento2/pull/1173) -- Change to HttpClient4 from Java client; fix regex issues
16+
* [#1185] (https://github.com/magento/magento2/pull/1185) -- Error message for duplicated phrases not allowed in Generator.php
17+
* [#1199] (https://github.com/magento/magento2/pull/1199) -- Add Event for sales_order_state_change_before during Order->saveState()
18+
* [#1201] (https://github.com/magento/magento2/pull/1101) -- Add customer_validate event
19+
* [#1202] (https://github.com/magento/magento2/pull/1102) -- Email sending events
20+
121
0.74.0-beta6
222
=============
323
* Framework 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.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta6",
7-
"magento/module-backend": "0.74.0-beta6",
8-
"magento/module-media-storage": "0.74.0-beta6",
9-
"magento/framework": "0.74.0-beta6",
6+
"magento/module-store": "0.74.0-beta7",
7+
"magento/module-backend": "0.74.0-beta7",
8+
"magento/module-media-storage": "0.74.0-beta7",
9+
"magento/framework": "0.74.0-beta7",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.74.0-beta6",
14+
"version": "0.74.0-beta7",
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.74.0-beta6",
7-
"magento/framework": "0.74.0-beta6",
6+
"magento/module-backend": "0.74.0-beta7",
7+
"magento/framework": "0.74.0-beta7",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.74.0-beta6",
11+
"version": "0.74.0-beta7",
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.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta6",
7-
"magento/module-directory": "0.74.0-beta6",
8-
"magento/module-developer": "0.74.0-beta6",
9-
"magento/module-eav": "0.74.0-beta6",
10-
"magento/module-cron": "0.74.0-beta6",
11-
"magento/module-theme": "0.74.0-beta6",
12-
"magento/module-reports": "0.74.0-beta6",
13-
"magento/module-sales": "0.74.0-beta6",
14-
"magento/module-quote": "0.74.0-beta6",
15-
"magento/module-catalog": "0.74.0-beta6",
16-
"magento/module-user": "0.74.0-beta6",
17-
"magento/module-backup": "0.74.0-beta6",
18-
"magento/module-customer": "0.74.0-beta6",
19-
"magento/module-translation": "0.74.0-beta6",
20-
"magento/module-require-js": "0.74.0-beta6",
21-
"magento/module-config": "0.74.0-beta6",
22-
"magento/framework": "0.74.0-beta6",
6+
"magento/module-store": "0.74.0-beta7",
7+
"magento/module-directory": "0.74.0-beta7",
8+
"magento/module-developer": "0.74.0-beta7",
9+
"magento/module-eav": "0.74.0-beta7",
10+
"magento/module-cron": "0.74.0-beta7",
11+
"magento/module-theme": "0.74.0-beta7",
12+
"magento/module-reports": "0.74.0-beta7",
13+
"magento/module-sales": "0.74.0-beta7",
14+
"magento/module-quote": "0.74.0-beta7",
15+
"magento/module-catalog": "0.74.0-beta7",
16+
"magento/module-user": "0.74.0-beta7",
17+
"magento/module-backup": "0.74.0-beta7",
18+
"magento/module-customer": "0.74.0-beta7",
19+
"magento/module-translation": "0.74.0-beta7",
20+
"magento/module-require-js": "0.74.0-beta7",
21+
"magento/module-config": "0.74.0-beta7",
22+
"magento/framework": "0.74.0-beta7",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "0.74.0-beta6",
26+
"version": "0.74.0-beta7",
2727
"license": [
2828
"OSL-3.0",
2929
"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.74.0-beta6",
7-
"magento/module-backend": "0.74.0-beta6",
8-
"magento/module-cron": "0.74.0-beta6",
9-
"magento/framework": "0.74.0-beta6",
6+
"magento/module-store": "0.74.0-beta7",
7+
"magento/module-backend": "0.74.0-beta7",
8+
"magento/module-cron": "0.74.0-beta7",
9+
"magento/framework": "0.74.0-beta7",
1010
"magento/magento-composer-installer": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "0.74.0-beta6",
13+
"version": "0.74.0-beta7",
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,28 +3,28 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta6",
7-
"magento/module-catalog": "0.74.0-beta6",
8-
"magento/module-tax": "0.74.0-beta6",
9-
"magento/module-backend": "0.74.0-beta6",
10-
"magento/module-sales": "0.74.0-beta6",
11-
"magento/module-checkout": "0.74.0-beta6",
12-
"magento/module-catalog-inventory": "0.74.0-beta6",
13-
"magento/module-customer": "0.74.0-beta6",
14-
"magento/module-catalog-rule": "0.74.0-beta6",
15-
"magento/module-eav": "0.74.0-beta6",
16-
"magento/module-config": "0.74.0-beta6",
17-
"magento/module-gift-message": "0.74.0-beta6",
18-
"magento/framework": "0.74.0-beta6",
19-
"magento/module-quote": "0.74.0-beta6",
20-
"magento/module-media-storage": "0.74.0-beta6",
6+
"magento/module-store": "0.74.0-beta7",
7+
"magento/module-catalog": "0.74.0-beta7",
8+
"magento/module-tax": "0.74.0-beta7",
9+
"magento/module-backend": "0.74.0-beta7",
10+
"magento/module-sales": "0.74.0-beta7",
11+
"magento/module-checkout": "0.74.0-beta7",
12+
"magento/module-catalog-inventory": "0.74.0-beta7",
13+
"magento/module-customer": "0.74.0-beta7",
14+
"magento/module-catalog-rule": "0.74.0-beta7",
15+
"magento/module-eav": "0.74.0-beta7",
16+
"magento/module-config": "0.74.0-beta7",
17+
"magento/module-gift-message": "0.74.0-beta7",
18+
"magento/framework": "0.74.0-beta7",
19+
"magento/module-quote": "0.74.0-beta7",
20+
"magento/module-media-storage": "0.74.0-beta7",
2121
"magento/magento-composer-installer": "*"
2222
},
2323
"suggest": {
24-
"magento/module-webapi": "0.74.0-beta6"
24+
"magento/module-webapi": "0.74.0-beta7"
2525
},
2626
"type": "magento2-module",
27-
"version": "0.74.0-beta6",
27+
"version": "0.74.0-beta7",
2828
"license": [
2929
"OSL-3.0",
3030
"AFL-3.0"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-page-cache": "0.74.0-beta6",
7-
"magento/framework": "0.74.0-beta6",
6+
"magento/module-page-cache": "0.74.0-beta7",
7+
"magento/framework": "0.74.0-beta7",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.74.0-beta6",
11+
"version": "0.74.0-beta7",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Captcha/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.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta6",
7-
"magento/module-customer": "0.74.0-beta6",
8-
"magento/module-checkout": "0.74.0-beta6",
9-
"magento/module-backend": "0.74.0-beta6",
10-
"magento/framework": "0.74.0-beta6",
6+
"magento/module-store": "0.74.0-beta7",
7+
"magento/module-customer": "0.74.0-beta7",
8+
"magento/module-checkout": "0.74.0-beta7",
9+
"magento/module-backend": "0.74.0-beta7",
10+
"magento/framework": "0.74.0-beta7",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.74.0-beta6",
14+
"version": "0.74.0-beta7",
1515
"license": [
1616
"OSL-3.0",
1717
"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-store": "0.74.0-beta6",
7-
"magento/module-eav": "0.74.0-beta6",
8-
"magento/module-cms": "0.74.0-beta6",
9-
"magento/module-indexer": "0.74.0-beta6",
10-
"magento/module-customer": "0.74.0-beta6",
11-
"magento/module-theme": "0.74.0-beta6",
12-
"magento/module-checkout": "0.74.0-beta6",
13-
"magento/module-log": "0.74.0-beta6",
14-
"magento/module-backend": "0.74.0-beta6",
15-
"magento/module-widget": "0.74.0-beta6",
16-
"magento/module-wishlist": "0.74.0-beta6",
17-
"magento/module-tax": "0.74.0-beta6",
18-
"magento/module-msrp": "0.74.0-beta6",
19-
"magento/module-catalog-inventory": "0.74.0-beta6",
20-
"magento/module-directory": "0.74.0-beta6",
21-
"magento/module-catalog-rule": "0.74.0-beta6",
22-
"magento/module-product-alert": "0.74.0-beta6",
23-
"magento/module-url-rewrite": "0.74.0-beta6",
24-
"magento/module-catalog-url-rewrite": "0.74.0-beta6",
25-
"magento/module-page-cache": "0.74.0-beta6",
26-
"magento/module-quote": "0.74.0-beta6",
27-
"magento/module-config": "0.74.0-beta6",
28-
"magento/module-media-storage": "0.74.0-beta6",
29-
"magento/framework": "0.74.0-beta6",
6+
"magento/module-store": "0.74.0-beta7",
7+
"magento/module-eav": "0.74.0-beta7",
8+
"magento/module-cms": "0.74.0-beta7",
9+
"magento/module-indexer": "0.74.0-beta7",
10+
"magento/module-customer": "0.74.0-beta7",
11+
"magento/module-theme": "0.74.0-beta7",
12+
"magento/module-checkout": "0.74.0-beta7",
13+
"magento/module-log": "0.74.0-beta7",
14+
"magento/module-backend": "0.74.0-beta7",
15+
"magento/module-widget": "0.74.0-beta7",
16+
"magento/module-wishlist": "0.74.0-beta7",
17+
"magento/module-tax": "0.74.0-beta7",
18+
"magento/module-msrp": "0.74.0-beta7",
19+
"magento/module-catalog-inventory": "0.74.0-beta7",
20+
"magento/module-directory": "0.74.0-beta7",
21+
"magento/module-catalog-rule": "0.74.0-beta7",
22+
"magento/module-product-alert": "0.74.0-beta7",
23+
"magento/module-url-rewrite": "0.74.0-beta7",
24+
"magento/module-catalog-url-rewrite": "0.74.0-beta7",
25+
"magento/module-page-cache": "0.74.0-beta7",
26+
"magento/module-quote": "0.74.0-beta7",
27+
"magento/module-config": "0.74.0-beta7",
28+
"magento/module-media-storage": "0.74.0-beta7",
29+
"magento/framework": "0.74.0-beta7",
3030
"magento/magento-composer-installer": "*"
3131
},
3232
"suggest": {
33-
"magento/module-cookie": "0.74.0-beta6"
33+
"magento/module-cookie": "0.74.0-beta7"
3434
},
3535
"type": "magento2-module",
36-
"version": "0.74.0-beta6",
36+
"version": "0.74.0-beta7",
3737
"license": [
3838
"OSL-3.0",
3939
"AFL-3.0"

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-catalog": "0.74.0-beta6",
7-
"magento/module-eav": "0.74.0-beta6",
8-
"magento/module-import-export": "0.74.0-beta6",
9-
"magento/module-indexer": "0.74.0-beta6",
10-
"magento/module-store": "0.74.0-beta6",
11-
"magento/module-catalog-inventory": "0.74.0-beta6",
12-
"magento/module-media-storage": "0.74.0-beta6",
13-
"magento/module-customer": "0.74.0-beta6",
14-
"magento/framework": "0.74.0-beta6",
6+
"magento/module-catalog": "0.74.0-beta7",
7+
"magento/module-eav": "0.74.0-beta7",
8+
"magento/module-import-export": "0.74.0-beta7",
9+
"magento/module-indexer": "0.74.0-beta7",
10+
"magento/module-store": "0.74.0-beta7",
11+
"magento/module-catalog-inventory": "0.74.0-beta7",
12+
"magento/module-media-storage": "0.74.0-beta7",
13+
"magento/module-customer": "0.74.0-beta7",
14+
"magento/framework": "0.74.0-beta7",
1515
"ext-ctype": "*",
1616
"magento/magento-composer-installer": "*"
1717
},
1818
"type": "magento2-module",
19-
"version": "0.74.0-beta6",
19+
"version": "0.74.0-beta7",
2020
"license": [
2121
"OSL-3.0",
2222
"AFL-3.0"

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-config": "0.74.0-beta6",
7-
"magento/module-store": "0.74.0-beta6",
8-
"magento/module-catalog": "0.74.0-beta6",
9-
"magento/module-customer": "0.74.0-beta6",
10-
"magento/module-indexer": "0.74.0-beta6",
11-
"magento/module-eav": "0.74.0-beta6",
12-
"magento/module-quote": "0.74.0-beta6",
13-
"magento/framework": "0.74.0-beta6",
6+
"magento/module-config": "0.74.0-beta7",
7+
"magento/module-store": "0.74.0-beta7",
8+
"magento/module-catalog": "0.74.0-beta7",
9+
"magento/module-customer": "0.74.0-beta7",
10+
"magento/module-indexer": "0.74.0-beta7",
11+
"magento/module-eav": "0.74.0-beta7",
12+
"magento/module-quote": "0.74.0-beta7",
13+
"magento/framework": "0.74.0-beta7",
1414
"magento/magento-composer-installer": "*"
1515
},
1616
"type": "magento2-module",
17-
"version": "0.74.0-beta6",
17+
"version": "0.74.0-beta7",
1818
"license": [
1919
"OSL-3.0",
2020
"AFL-3.0"

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta6",
7-
"magento/module-rule": "0.74.0-beta6",
8-
"magento/module-catalog": "0.74.0-beta6",
9-
"magento/module-customer": "0.74.0-beta6",
10-
"magento/module-backend": "0.74.0-beta6",
11-
"magento/module-eav": "0.74.0-beta6",
12-
"magento/module-indexer": "0.74.0-beta6",
13-
"magento/module-import-export": "0.74.0-beta6",
14-
"magento/framework": "0.74.0-beta6",
6+
"magento/module-store": "0.74.0-beta7",
7+
"magento/module-rule": "0.74.0-beta7",
8+
"magento/module-catalog": "0.74.0-beta7",
9+
"magento/module-customer": "0.74.0-beta7",
10+
"magento/module-backend": "0.74.0-beta7",
11+
"magento/module-eav": "0.74.0-beta7",
12+
"magento/module-indexer": "0.74.0-beta7",
13+
"magento/module-import-export": "0.74.0-beta7",
14+
"magento/framework": "0.74.0-beta7",
1515
"magento/magento-composer-installer": "*"
1616
},
1717
"type": "magento2-module",
18-
"version": "0.74.0-beta6",
18+
"version": "0.74.0-beta7",
1919
"license": [
2020
"OSL-3.0",
2121
"AFL-3.0"

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta6",
7-
"magento/module-catalog": "0.74.0-beta6",
8-
"magento/module-search": "0.74.0-beta6",
9-
"magento/module-customer": "0.74.0-beta6",
10-
"magento/module-directory": "0.74.0-beta6",
11-
"magento/module-indexer": "0.74.0-beta6",
12-
"magento/module-eav": "0.74.0-beta6",
13-
"magento/module-backend": "0.74.0-beta6",
14-
"magento/module-theme": "0.74.0-beta6",
15-
"magento/framework": "0.74.0-beta6",
6+
"magento/module-store": "0.74.0-beta7",
7+
"magento/module-catalog": "0.74.0-beta7",
8+
"magento/module-search": "0.74.0-beta7",
9+
"magento/module-customer": "0.74.0-beta7",
10+
"magento/module-directory": "0.74.0-beta7",
11+
"magento/module-indexer": "0.74.0-beta7",
12+
"magento/module-eav": "0.74.0-beta7",
13+
"magento/module-backend": "0.74.0-beta7",
14+
"magento/module-theme": "0.74.0-beta7",
15+
"magento/framework": "0.74.0-beta7",
1616
"magento/magento-composer-installer": "*"
1717
},
1818
"type": "magento2-module",
19-
"version": "0.74.0-beta6",
19+
"version": "0.74.0-beta7",
2020
"license": [
2121
"OSL-3.0",
2222
"AFL-3.0"

0 commit comments

Comments
 (0)