Skip to content

Commit 320f41d

Browse files
author
Igor Melnikov
committed
Merge branch 'upstream-develop' into time_zone
2 parents df7f428 + 1b6e07b commit 320f41d

File tree

124 files changed

+1463
-1200
lines changed

Some content is hidden

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

124 files changed

+1463
-1200
lines changed

‎CHANGELOG.md

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,53 @@
1+
2.0.0-rc2
2+
=============
3+
* Fixed bugs:
4+
* Fixed an issue where video didn’t play on iPad and iPhone
5+
* Fixed an issue where Admin panel was not accessible if port was used in URL
6+
* Fixed an issue where database name could not be changed after fail during installation process
7+
* Fixed an issue where bundle items quantities could not be saved when editing a bundle product in a wishlist on the storefront
8+
* Fixed PHP issue which appeared during Text Swatch product attribute creation
9+
* Fixed Mini Shopping Cart re-sizing after removing the product
10+
* Fixed an issue with negative subtotal during PayPal checkout
11+
* Fixed inconsistent credit card validation
12+
* Fixed an issue where the Product Gallery did not completely overlay the bottom layer in the full-screen view
13+
* Fixed an issue where the Product Gallery could not be easily opened in the full-screen view
14+
* Fixed an issue where the “+” icon was displayed on video preview hover
15+
* Fixed an issue where video preview was visible under video player
16+
* Fixed an issue where 'Admin' was not a required field for the new Swatch
17+
* Fixed an issue where shipping and billing country information was not transmitted to PayPal
18+
* Fixed an issue with the attribute in configurable products
19+
* Fixed a category page load time
20+
* Removed space outside the visible area in Admin
21+
* Fixed an issue where Magento was stuck in the maintenance mode, if a backup was created when disabling modules via Web Setup Wizard
22+
* Fixed session response to be in JSON
23+
* Fixed an issue where an out of stock product was displayed on the storefront
24+
* Fixed an error which appeared during product import with replace behavior
25+
* Fixed an issue were URL rewrites in catalog categories were wrong after URL key for a store view was changed or a category was moved
26+
* Fixed an issue where JSON was received instead of normal page when trying to delete a category after reset
27+
* Fixed an issue where product API with "all" store code did not work
28+
* Fixed the misleading system message about invalid indexers
29+
* Fixed an issue where a bundle product created using Web API was not visible on the storefront
30+
* Fixed an issue where it was impossible to save more than one configuration for a configurable product with the text swatch attribute
31+
* Fixed an issue with the absence of a proper indication about why an image could not be deleted not deleted when it was used in one of the store views
32+
* Fixed an issue with data modification in export result file
33+
* Fixed an issue with the incorrect behavior of the required check box custom
34+
* Fixed an issue where an exception was thrown when trying to install Magento having previously installed and uninstalled it
35+
* Fixed an issue where changing the layout of a CMS page caused its design theme to change to Magento Blank
36+
* Fixed an issue where CMS pages API did not work with store code
37+
* Fixed an issue where CMS blocks API did not work for multiple websites
38+
* Fixed an issue where XSS Payload could been saved into Admin Panel
39+
* Fixed an issue where an error caused by adding a new swatch attribute persisted after deleting the attribute
40+
* Fixed PHP notice which appeared during text swatch product attribute creation
41+
* Fixed JS error on credit memo view grid during export to CSV
42+
* Fixed an issue where a user was redirected to a blank page when canceling checkout with PayPal Express in Website Payments Pro Hosted Solution
43+
* Fixed an issue where it was impossible to checkout if Persistent Shopping Cart is enabled
44+
* Fixed an issue where it was impossible to complete the Braintree PayPal Checkout if Street line 2 is empty
45+
* Fixed an issue with XSS Payload in website's translation table
46+
* Fixed an issue where payment functionality matrix section was suitable only for AbstractMethod specializations, leaving other payment methods without valuable information
47+
* GitHub issues and requests:
48+
* [#2276](https://github.com/magento/magento2/issues/2276) -- Notice: getimagesize(): Read error! in app/code/Magento/Catalog/Model/Product/Image.php on line 949
49+
* [#2128](https://github.com/magento/magento2/issues/2128) -- wrong filename on products list
50+
151
2.0.0-rc
252
=============
353
* Performance improvements:

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,22 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0|~7.0.0",
6-
"magento/module-store": "100.0.0",
7-
"magento/module-backend": "100.0.0",
8-
"magento/module-media-storage": "100.0.0",
9-
"magento/framework": "100.0.0",
6+
"magento/module-store": "100.0.*",
7+
"magento/module-backend": "100.0.*",
8+
"magento/module-media-storage": "100.0.*",
9+
"magento/framework": "100.0.*",
1010
"lib-libxml": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "100.0.0",
13+
"version": "100.0.1",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"
1717
],
1818
"autoload": {
19-
"files": [ "registration.php" ],
19+
"files": [
20+
"registration.php"
21+
],
2022
"psr-4": {
2123
"Magento\\AdminNotification\\": ""
2224
}

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

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
{
2-
"name": "magento/module-advanced-pricing-import-export",
3-
"description": "N/A",
4-
"require": {
5-
"php": "~5.5.0|~5.6.0|~7.0.0",
6-
"magento/module-catalog": "100.0.0",
7-
"magento/module-catalog-inventory": "100.0.0",
8-
"magento/module-eav": "100.0.0",
9-
"magento/module-import-export": "100.0.0",
10-
"magento/module-catalog-import-export": "100.0.0",
11-
"magento/module-customer": "100.0.0",
12-
"magento/module-store": "100.0.0",
13-
"magento/framework": "100.0.0"
14-
},
15-
"type": "magento2-module",
16-
"version": "100.0.0",
17-
"license": [
18-
"OSL-3.0",
19-
"AFL-3.0"
20-
],
21-
"autoload": {
22-
"files": [ "registration.php" ],
23-
"psr-4": {
24-
"Magento\\AdvancedPricingImportExport\\": ""
2+
"name": "magento/module-advanced-pricing-import-export",
3+
"description": "N/A",
4+
"require": {
5+
"php": "~5.5.0|~5.6.0|~7.0.0",
6+
"magento/module-catalog": "100.0.*",
7+
"magento/module-catalog-inventory": "100.0.*",
8+
"magento/module-eav": "100.0.*",
9+
"magento/module-import-export": "100.0.*",
10+
"magento/module-catalog-import-export": "100.0.*",
11+
"magento/module-customer": "100.0.*",
12+
"magento/module-store": "100.0.*",
13+
"magento/framework": "100.0.*"
14+
},
15+
"type": "magento2-module",
16+
"version": "100.0.1",
17+
"license": [
18+
"OSL-3.0",
19+
"AFL-3.0"
20+
],
21+
"autoload": {
22+
"files": [
23+
"registration.php"
24+
],
25+
"psr-4": {
26+
"Magento\\AdvancedPricingImportExport\\": ""
27+
}
2528
}
26-
}
2729
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,19 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.5.0|~5.6.0|~7.0.0",
6-
"magento/module-backend": "100.0.0",
7-
"magento/framework": "100.0.0"
6+
"magento/module-backend": "100.0.*",
7+
"magento/framework": "100.0.*"
88
},
99
"type": "magento2-module",
10-
"version": "100.0.0",
10+
"version": "100.0.1",
1111
"license": [
1212
"OSL-3.0",
1313
"AFL-3.0"
1414
],
1515
"autoload": {
16-
"files": [ "registration.php" ],
16+
"files": [
17+
"registration.php"
18+
],
1719
"psr-4": {
1820
"Magento\\Authorization\\": ""
1921
}

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,24 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0|~7.0.0",
6-
"magento/module-sales": "100.0.0",
7-
"magento/module-store": "100.0.0",
8-
"magento/module-quote": "100.0.0",
9-
"magento/module-checkout": "100.0.0",
10-
"magento/module-backend": "100.0.0",
11-
"magento/module-payment": "100.0.0",
12-
"magento/module-catalog": "100.0.0",
13-
"magento/framework": "100.0.0"
6+
"magento/module-sales": "100.0.*",
7+
"magento/module-store": "100.0.*",
8+
"magento/module-quote": "100.0.*",
9+
"magento/module-checkout": "100.0.*",
10+
"magento/module-backend": "100.0.*",
11+
"magento/module-payment": "100.0.*",
12+
"magento/module-catalog": "100.0.*",
13+
"magento/framework": "100.0.*"
1414
},
1515
"type": "magento2-module",
16-
"version": "100.0.0",
16+
"version": "100.0.1",
1717
"license": [
1818
"proprietary"
1919
],
2020
"autoload": {
21-
"files": [ "registration.php" ],
21+
"files": [
22+
"registration.php"
23+
],
2224
"psr-4": {
2325
"Magento\\Authorizenet\\": ""
2426
}

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

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,33 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0|~7.0.0",
6-
"magento/module-store": "100.0.0",
7-
"magento/module-directory": "100.0.0",
8-
"magento/module-developer": "100.0.0",
9-
"magento/module-eav": "100.0.0",
10-
"magento/module-theme": "100.0.0",
11-
"magento/module-reports": "100.0.0",
12-
"magento/module-sales": "100.0.0",
13-
"magento/module-quote": "100.0.0",
14-
"magento/module-catalog": "100.0.0",
15-
"magento/module-user": "100.0.0",
16-
"magento/module-backup": "100.0.0",
17-
"magento/module-customer": "100.0.0",
18-
"magento/module-translation": "100.0.0",
19-
"magento/module-require-js": "100.0.0",
20-
"magento/module-config": "100.0.0",
21-
"magento/framework": "100.0.0"
6+
"magento/module-store": "100.0.*",
7+
"magento/module-directory": "100.0.*",
8+
"magento/module-developer": "100.0.*",
9+
"magento/module-eav": "100.0.*",
10+
"magento/module-theme": "100.0.*",
11+
"magento/module-reports": "100.0.*",
12+
"magento/module-sales": "100.0.*",
13+
"magento/module-quote": "100.0.*",
14+
"magento/module-catalog": "100.0.*",
15+
"magento/module-user": "100.0.*",
16+
"magento/module-backup": "100.0.*",
17+
"magento/module-customer": "100.0.*",
18+
"magento/module-translation": "100.0.*",
19+
"magento/module-require-js": "100.0.*",
20+
"magento/module-config": "100.0.*",
21+
"magento/framework": "100.0.*"
2222
},
2323
"type": "magento2-module",
24-
"version": "100.0.0",
24+
"version": "100.0.1",
2525
"license": [
2626
"OSL-3.0",
2727
"AFL-3.0"
2828
],
2929
"autoload": {
30-
"files": [ "registration.php" ],
30+
"files": [
31+
"registration.php"
32+
],
3133
"psr-4": {
3234
"Magento\\Backend\\": ""
3335
}

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,21 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0|~7.0.0",
6-
"magento/module-store": "100.0.0",
7-
"magento/module-backend": "100.0.0",
8-
"magento/module-cron": "100.0.0",
9-
"magento/framework": "100.0.0"
6+
"magento/module-store": "100.0.*",
7+
"magento/module-backend": "100.0.*",
8+
"magento/module-cron": "100.0.*",
9+
"magento/framework": "100.0.*"
1010
},
1111
"type": "magento2-module",
12-
"version": "100.0.0",
12+
"version": "100.0.1",
1313
"license": [
1414
"OSL-3.0",
1515
"AFL-3.0"
1616
],
1717
"autoload": {
18-
"files": [ "registration.php" ],
18+
"files": [
19+
"registration.php"
20+
],
1921
"psr-4": {
2022
"Magento\\Backup\\": ""
2123
}

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

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,37 @@
11
{
2-
"name": "magento/module-braintree",
3-
"description": "N/A",
4-
"require": {
5-
"php": "~5.5.0|~5.6.0|~7.0.0",
6-
"magento/module-config": "100.0.0",
7-
"magento/module-store": "100.0.0",
8-
"magento/module-checkout": "100.0.0",
9-
"magento/module-catalog": "100.0.0",
10-
"magento/module-sales": "100.0.0",
11-
"magento/module-customer": "100.0.0",
12-
"magento/module-payment": "100.0.0",
13-
"magento/module-paypal": "100.0.0",
14-
"magento/module-quote": "100.0.0",
15-
"magento/module-backend": "100.0.0",
16-
"magento/module-directory": "100.0.0",
17-
"magento/module-theme": "100.0.0",
18-
"magento/framework": "100.0.0",
19-
"braintree/braintree_php": "2.39.0"
20-
},
21-
"suggest": {
22-
"magento/module-checkout-agreements": "100.0.0"
23-
},
24-
"type": "magento2-module",
25-
"version": "100.0.0",
26-
"license": [
27-
"proprietary"
28-
],
29-
"autoload": {
30-
"files": [ "registration.php" ],
31-
"psr-4": {
32-
"Magento\\Braintree\\": ""
2+
"name": "magento/module-braintree",
3+
"description": "N/A",
4+
"require": {
5+
"php": "~5.5.0|~5.6.0|~7.0.0",
6+
"magento/module-config": "100.0.*",
7+
"magento/module-store": "100.0.*",
8+
"magento/module-checkout": "100.0.*",
9+
"magento/module-catalog": "100.0.*",
10+
"magento/module-sales": "100.0.*",
11+
"magento/module-customer": "100.0.*",
12+
"magento/module-payment": "100.0.*",
13+
"magento/module-paypal": "100.0.*",
14+
"magento/module-quote": "100.0.*",
15+
"magento/module-backend": "100.0.*",
16+
"magento/module-directory": "100.0.*",
17+
"magento/module-theme": "100.0.*",
18+
"magento/framework": "100.0.*",
19+
"braintree/braintree_php": "2.39.0"
20+
},
21+
"suggest": {
22+
"magento/module-checkout-agreements": "100.0.*"
23+
},
24+
"type": "magento2-module",
25+
"version": "100.0.1",
26+
"license": [
27+
"proprietary"
28+
],
29+
"autoload": {
30+
"files": [
31+
"registration.php"
32+
],
33+
"psr-4": {
34+
"Magento\\Braintree\\": ""
35+
}
3336
}
34-
}
3537
}

0 commit comments

Comments
 (0)