Skip to content

Commit f324fae

Browse files
author
Maxim Medinskiy
committed
Merge remote-tracking branch 'magento2/merchant_beta' into MAGETWO-43648
2 parents 0567400 + 6e70802 commit f324fae

File tree

106 files changed

+893
-875
lines changed

Some content is hidden

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

106 files changed

+893
-875
lines changed

‎CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
1.0.0-beta5
2+
=============
3+
* Fixed bugs:
4+
* Fixed an issue where search results are not ordered properly for sorting options
5+
* Fixed an issue with mini cart qty after checkout login and aborted checkout
6+
* Fixed an issue with title prefix on page headings
7+
* Fixed an issue when invalid postcode allows the customer to continue the checkout process
8+
* Fixed an issue with import of configurable products
9+
* Fixed an issue with missed attributes during products export
10+
* Fixed an issue with naming in resources configuration
11+
* Fixed an issue with title prefix on page headings
12+
* Fixed an issue with title prefix on page headings
13+
* Fixed an issue with color swatches when attribute is out of stock
14+
* Fixed an issue with singe tenant compiler
15+
* Fixed an issue with Braintree Paypal Checkout button in popup
16+
* Various improvements:
17+
* Implemented CMS page preview without area emulation
18+
119
1.0.0-beta4
220
=============
321
* Fixed bugs:

‎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": "1.0.0-beta4",
7-
"magento/module-backend": "1.0.0-beta4",
8-
"magento/module-media-storage": "1.0.0-beta4",
9-
"magento/framework": "1.0.0-beta4",
6+
"magento/module-store": "1.0.0-beta5",
7+
"magento/module-backend": "1.0.0-beta5",
8+
"magento/module-media-storage": "1.0.0-beta5",
9+
"magento/framework": "1.0.0-beta5",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "1.0.0-beta4",
14+
"version": "1.0.0-beta5",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/AdvancedPricingImportExport/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-catalog": "1.0.0-beta4",
7-
"magento/module-catalog-inventory": "1.0.0-beta4",
8-
"magento/module-eav": "1.0.0-beta4",
9-
"magento/module-import-export": "1.0.0-beta4",
10-
"magento/module-catalog-import-export": "1.0.0-beta4",
11-
"magento/module-customer": "1.0.0-beta4",
12-
"magento/module-store": "1.0.0-beta4",
13-
"magento/framework": "1.0.0-beta4",
6+
"magento/module-catalog": "1.0.0-beta5",
7+
"magento/module-catalog-inventory": "1.0.0-beta5",
8+
"magento/module-eav": "1.0.0-beta5",
9+
"magento/module-import-export": "1.0.0-beta5",
10+
"magento/module-catalog-import-export": "1.0.0-beta5",
11+
"magento/module-customer": "1.0.0-beta5",
12+
"magento/module-store": "1.0.0-beta5",
13+
"magento/framework": "1.0.0-beta5",
1414
"magento/magento-composer-installer": "*"
1515
},
1616
"type": "magento2-module",
17-
"version": "1.0.0-beta4",
17+
"version": "1.0.0-beta5",
1818
"license": [
1919
"OSL-3.0",
2020
"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": "1.0.0-beta4",
7-
"magento/framework": "1.0.0-beta4",
6+
"magento/module-backend": "1.0.0-beta5",
7+
"magento/framework": "1.0.0-beta5",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "1.0.0-beta4",
11+
"version": "1.0.0-beta5",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Authorizenet/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-sales": "1.0.0-beta4",
7-
"magento/module-store": "1.0.0-beta4",
8-
"magento/module-quote": "1.0.0-beta4",
9-
"magento/module-checkout": "1.0.0-beta4",
10-
"magento/module-backend": "1.0.0-beta4",
11-
"magento/module-payment": "1.0.0-beta4",
12-
"magento/module-catalog": "1.0.0-beta4",
13-
"magento/framework": "1.0.0-beta4",
6+
"magento/module-sales": "1.0.0-beta5",
7+
"magento/module-store": "1.0.0-beta5",
8+
"magento/module-quote": "1.0.0-beta5",
9+
"magento/module-checkout": "1.0.0-beta5",
10+
"magento/module-backend": "1.0.0-beta5",
11+
"magento/module-payment": "1.0.0-beta5",
12+
"magento/module-catalog": "1.0.0-beta5",
13+
"magento/framework": "1.0.0-beta5",
1414
"magento/magento-composer-installer": "*"
1515
},
1616
"type": "magento2-module",
17-
"version": "1.0.0-beta4",
17+
"version": "1.0.0-beta5",
1818
"license": [
1919
"proprietary"
2020
],

‎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": "1.0.0-beta4",
7-
"magento/module-directory": "1.0.0-beta4",
8-
"magento/module-developer": "1.0.0-beta4",
9-
"magento/module-eav": "1.0.0-beta4",
10-
"magento/module-cron": "1.0.0-beta4",
11-
"magento/module-theme": "1.0.0-beta4",
12-
"magento/module-reports": "1.0.0-beta4",
13-
"magento/module-sales": "1.0.0-beta4",
14-
"magento/module-quote": "1.0.0-beta4",
15-
"magento/module-catalog": "1.0.0-beta4",
16-
"magento/module-user": "1.0.0-beta4",
17-
"magento/module-backup": "1.0.0-beta4",
18-
"magento/module-customer": "1.0.0-beta4",
19-
"magento/module-translation": "1.0.0-beta4",
20-
"magento/module-require-js": "1.0.0-beta4",
21-
"magento/module-config": "1.0.0-beta4",
22-
"magento/framework": "1.0.0-beta4",
6+
"magento/module-store": "1.0.0-beta5",
7+
"magento/module-directory": "1.0.0-beta5",
8+
"magento/module-developer": "1.0.0-beta5",
9+
"magento/module-eav": "1.0.0-beta5",
10+
"magento/module-cron": "1.0.0-beta5",
11+
"magento/module-theme": "1.0.0-beta5",
12+
"magento/module-reports": "1.0.0-beta5",
13+
"magento/module-sales": "1.0.0-beta5",
14+
"magento/module-quote": "1.0.0-beta5",
15+
"magento/module-catalog": "1.0.0-beta5",
16+
"magento/module-user": "1.0.0-beta5",
17+
"magento/module-backup": "1.0.0-beta5",
18+
"magento/module-customer": "1.0.0-beta5",
19+
"magento/module-translation": "1.0.0-beta5",
20+
"magento/module-require-js": "1.0.0-beta5",
21+
"magento/module-config": "1.0.0-beta5",
22+
"magento/framework": "1.0.0-beta5",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "1.0.0-beta4",
26+
"version": "1.0.0-beta5",
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": "1.0.0-beta4",
7-
"magento/module-backend": "1.0.0-beta4",
8-
"magento/module-cron": "1.0.0-beta4",
9-
"magento/framework": "1.0.0-beta4",
6+
"magento/module-store": "1.0.0-beta5",
7+
"magento/module-backend": "1.0.0-beta5",
8+
"magento/module-cron": "1.0.0-beta5",
9+
"magento/framework": "1.0.0-beta5",
1010
"magento/magento-composer-installer": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "1.0.0-beta4",
13+
"version": "1.0.0-beta5",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

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

Lines changed: 15 additions & 15 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-config": "1.0.0-beta4",
7-
"magento/module-store": "1.0.0-beta4",
8-
"magento/module-checkout": "1.0.0-beta4",
9-
"magento/module-catalog": "1.0.0-beta4",
10-
"magento/module-sales": "1.0.0-beta4",
11-
"magento/module-customer": "1.0.0-beta4",
12-
"magento/module-payment": "1.0.0-beta4",
13-
"magento/module-paypal": "1.0.0-beta4",
14-
"magento/module-quote": "1.0.0-beta4",
15-
"magento/module-backend": "1.0.0-beta4",
16-
"magento/module-directory": "1.0.0-beta4",
17-
"magento/module-theme": "1.0.0-beta4",
18-
"magento/framework": "1.0.0-beta4",
6+
"magento/module-config": "1.0.0-beta5",
7+
"magento/module-store": "1.0.0-beta5",
8+
"magento/module-checkout": "1.0.0-beta5",
9+
"magento/module-catalog": "1.0.0-beta5",
10+
"magento/module-sales": "1.0.0-beta5",
11+
"magento/module-customer": "1.0.0-beta5",
12+
"magento/module-payment": "1.0.0-beta5",
13+
"magento/module-paypal": "1.0.0-beta5",
14+
"magento/module-quote": "1.0.0-beta5",
15+
"magento/module-backend": "1.0.0-beta5",
16+
"magento/module-directory": "1.0.0-beta5",
17+
"magento/module-theme": "1.0.0-beta5",
18+
"magento/framework": "1.0.0-beta5",
1919
"braintree/braintree_php": "2.39.0",
2020
"magento/magento-composer-installer": "*"
2121
},
2222
"suggest": {
23-
"magento/module-checkout-agreements": "1.0.0-beta4"
23+
"magento/module-checkout-agreements": "1.0.0-beta5"
2424
},
2525
"type": "magento2-module",
26-
"version": "1.0.0-beta4",
26+
"version": "1.0.0-beta5",
2727
"license": [
2828
"proprietary"
2929
],

‎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": "1.0.0-beta4",
7-
"magento/module-catalog": "1.0.0-beta4",
8-
"magento/module-tax": "1.0.0-beta4",
9-
"magento/module-backend": "1.0.0-beta4",
10-
"magento/module-sales": "1.0.0-beta4",
11-
"magento/module-checkout": "1.0.0-beta4",
12-
"magento/module-catalog-inventory": "1.0.0-beta4",
13-
"magento/module-customer": "1.0.0-beta4",
14-
"magento/module-catalog-rule": "1.0.0-beta4",
15-
"magento/module-eav": "1.0.0-beta4",
16-
"magento/module-config": "1.0.0-beta4",
17-
"magento/module-gift-message": "1.0.0-beta4",
18-
"magento/framework": "1.0.0-beta4",
19-
"magento/module-quote": "1.0.0-beta4",
20-
"magento/module-media-storage": "1.0.0-beta4",
6+
"magento/module-store": "1.0.0-beta5",
7+
"magento/module-catalog": "1.0.0-beta5",
8+
"magento/module-tax": "1.0.0-beta5",
9+
"magento/module-backend": "1.0.0-beta5",
10+
"magento/module-sales": "1.0.0-beta5",
11+
"magento/module-checkout": "1.0.0-beta5",
12+
"magento/module-catalog-inventory": "1.0.0-beta5",
13+
"magento/module-customer": "1.0.0-beta5",
14+
"magento/module-catalog-rule": "1.0.0-beta5",
15+
"magento/module-eav": "1.0.0-beta5",
16+
"magento/module-config": "1.0.0-beta5",
17+
"magento/module-gift-message": "1.0.0-beta5",
18+
"magento/framework": "1.0.0-beta5",
19+
"magento/module-quote": "1.0.0-beta5",
20+
"magento/module-media-storage": "1.0.0-beta5",
2121
"magento/magento-composer-installer": "*"
2222
},
2323
"suggest": {
24-
"magento/module-webapi": "1.0.0-beta4"
24+
"magento/module-webapi": "1.0.0-beta5"
2525
},
2626
"type": "magento2-module",
27-
"version": "1.0.0-beta4",
27+
"version": "1.0.0-beta5",
2828
"license": [
2929
"OSL-3.0",
3030
"AFL-3.0"

‎app/code/Magento/BundleImportExport/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-catalog": "1.0.0-beta4",
7-
"magento/module-import-export": "1.0.0-beta4",
8-
"magento/module-catalog-import-export": "1.0.0-beta4",
9-
"magento/module-bundle": "1.0.0-beta4",
10-
"magento/module-eav": "1.0.0-beta4",
11-
"magento/framework": "1.0.0-beta4",
6+
"magento/module-catalog": "1.0.0-beta5",
7+
"magento/module-import-export": "1.0.0-beta5",
8+
"magento/module-catalog-import-export": "1.0.0-beta5",
9+
"magento/module-bundle": "1.0.0-beta5",
10+
"magento/module-eav": "1.0.0-beta5",
11+
"magento/framework": "1.0.0-beta5",
1212
"magento/magento-composer-installer": "*"
1313
},
1414
"type": "magento2-module",
15-
"version": "1.0.0-beta4",
15+
"version": "1.0.0-beta5",
1616
"license": [
1717
"OSL-3.0",
1818
"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": "1.0.0-beta4",
7-
"magento/framework": "1.0.0-beta4",
6+
"magento/module-page-cache": "1.0.0-beta5",
7+
"magento/framework": "1.0.0-beta5",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "1.0.0-beta4",
11+
"version": "1.0.0-beta5",
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": "1.0.0-beta4",
7-
"magento/module-customer": "1.0.0-beta4",
8-
"magento/module-checkout": "1.0.0-beta4",
9-
"magento/module-backend": "1.0.0-beta4",
10-
"magento/framework": "1.0.0-beta4",
6+
"magento/module-store": "1.0.0-beta5",
7+
"magento/module-customer": "1.0.0-beta5",
8+
"magento/module-checkout": "1.0.0-beta5",
9+
"magento/module-backend": "1.0.0-beta5",
10+
"magento/framework": "1.0.0-beta5",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "1.0.0-beta4",
14+
"version": "1.0.0-beta5",
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,39 +3,39 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "1.0.0-beta4",
7-
"magento/module-eav": "1.0.0-beta4",
8-
"magento/module-cms": "1.0.0-beta4",
9-
"magento/module-indexer": "1.0.0-beta4",
10-
"magento/module-customer": "1.0.0-beta4",
11-
"magento/module-theme": "1.0.0-beta4",
12-
"magento/module-checkout": "1.0.0-beta4",
13-
"magento/module-log": "1.0.0-beta4",
14-
"magento/module-backend": "1.0.0-beta4",
15-
"magento/module-widget": "1.0.0-beta4",
16-
"magento/module-wishlist": "1.0.0-beta4",
17-
"magento/module-tax": "1.0.0-beta4",
18-
"magento/module-msrp": "1.0.0-beta4",
19-
"magento/module-catalog-inventory": "1.0.0-beta4",
20-
"magento/module-directory": "1.0.0-beta4",
21-
"magento/module-catalog-rule": "1.0.0-beta4",
22-
"magento/module-product-alert": "1.0.0-beta4",
23-
"magento/module-url-rewrite": "1.0.0-beta4",
24-
"magento/module-catalog-url-rewrite": "1.0.0-beta4",
25-
"magento/module-page-cache": "1.0.0-beta4",
26-
"magento/module-quote": "1.0.0-beta4",
27-
"magento/module-config": "1.0.0-beta4",
28-
"magento/module-media-storage": "1.0.0-beta4",
29-
"magento/framework": "1.0.0-beta4",
6+
"magento/module-store": "1.0.0-beta5",
7+
"magento/module-eav": "1.0.0-beta5",
8+
"magento/module-cms": "1.0.0-beta5",
9+
"magento/module-indexer": "1.0.0-beta5",
10+
"magento/module-customer": "1.0.0-beta5",
11+
"magento/module-theme": "1.0.0-beta5",
12+
"magento/module-checkout": "1.0.0-beta5",
13+
"magento/module-log": "1.0.0-beta5",
14+
"magento/module-backend": "1.0.0-beta5",
15+
"magento/module-widget": "1.0.0-beta5",
16+
"magento/module-wishlist": "1.0.0-beta5",
17+
"magento/module-tax": "1.0.0-beta5",
18+
"magento/module-msrp": "1.0.0-beta5",
19+
"magento/module-catalog-inventory": "1.0.0-beta5",
20+
"magento/module-directory": "1.0.0-beta5",
21+
"magento/module-catalog-rule": "1.0.0-beta5",
22+
"magento/module-product-alert": "1.0.0-beta5",
23+
"magento/module-url-rewrite": "1.0.0-beta5",
24+
"magento/module-catalog-url-rewrite": "1.0.0-beta5",
25+
"magento/module-page-cache": "1.0.0-beta5",
26+
"magento/module-quote": "1.0.0-beta5",
27+
"magento/module-config": "1.0.0-beta5",
28+
"magento/module-media-storage": "1.0.0-beta5",
29+
"magento/framework": "1.0.0-beta5",
3030
"magento/module-configurable-product": "self.version",
3131
"magento/module-ui": "self.version",
3232
"magento/magento-composer-installer": "*"
3333
},
3434
"suggest": {
35-
"magento/module-cookie": "1.0.0-beta4"
35+
"magento/module-cookie": "1.0.0-beta5"
3636
},
3737
"type": "magento2-module",
38-
"version": "1.0.0-beta4",
38+
"version": "1.0.0-beta5",
3939
"license": [
4040
"OSL-3.0",
4141
"AFL-3.0"

0 commit comments

Comments
 (0)