Skip to content

Commit b00ef5e

Browse files
author
Hayder Sharhan
committed
Merge remote-tracking branch 'remotes/origin/2.0' into api-2.0.1patch
2 parents 5102f66 + e8d0624 commit b00ef5e

File tree

195 files changed

+2688
-1342
lines changed

Some content is hidden

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

195 files changed

+2688
-1342
lines changed

‎CHANGELOG.md

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,40 @@
11
2.0.1
22
=============
33
* Fixed bugs:
4-
* Fixed an issue where can't deploy sample data after "composer create-project"
5-
* Fixed a security issue on user account page
6-
* Fixed a security issue on product page
7-
* Fixed an issue where possible edit someone else reviews
8-
* Fixed an issue where possible view order details for certain orders
9-
* Fixed an issue where catalog price rule isn't applied to product created using Web API
10-
* Fixed a potential vulnerability where possible insert SQL injection
11-
* Fixed a potential vulnerability on checkout page
12-
* Fixed an issue with upload empty file to custom option
13-
* Fixed an issue with performance on customer edit form
4+
* Fixed an issue to allow deployment of sample data after running "composer create-project"
5+
* Fixed an issue that made it possible for someone to edit someone else's reviews
6+
* Fixed an issue that made it possible to view order details for certain orders that were created by someone else
7+
* Fixed an issue where catalog price rule isn't applied to a product that is created when using Web API
8+
* Fixed an issue where an empty file was uploaded to custom option
9+
* Fixed an issue where minicart does not clears after completing an order via PayPal
10+
* Fixed an issue plugin incorrect calls when proxy exists
11+
* Fixed an issue when travis CI builds fail due to authentication
12+
* Fixed an issue when custom options for configurable products were calculated incorrectly
13+
* Fixed an issue with modifying a category form on store view level
14+
* Fixed an issue where URL rewrites worked incorrectly for sample data
15+
* Fixed an issue with BaseURL in static files
16+
* Fixed an issue where a customer's custom attribute of 'file' type isn't supported by UI Form Component
17+
* Fixed an issue when bin/magento setup:upgrade does not clear cache properly
18+
* Fixed an issue where category creation from product page fails if Google Chrome Experiments are enabled
19+
* Fixed an issue where information about the country selected in address is not presented in checkout flow
20+
* Fixed an issue where customer segments prevent page from caching
21+
* Fixed an issue where an imported product with replace behaviour causes an error for multi-store implementations.
22+
* Fixed an issue with validation of url_key during import
23+
* Fixed an issue with "Learn More" link for Payments Pro goes to Payflow Pro
24+
* Fixed an issue in which a JS error appears if loading a product grid after clearing cache and static files
1425
* GitHub requests:
1526
* [#2519](https://github.com/magento/magento2/issues/2519) -- Fixed an issue where synonyms don't work with Magento 2.0
16-
27+
* [#2675](https://github.com/magento/magento2/issues/2675) -- Fixed an issue with admin order creation when config "Include Tax In Order Total is set to yes
28+
* [#2471](https://github.com/magento/magento2/issues/2471) -- Fixed an issue with incorrect prices on configurable product page when catalog prices include tax
29+
* [#2674](https://github.com/magento/magento2/issues/2674) -- Fixed an issue where plugins/interceptors don't work with early stage single instance objects
30+
* [#2888](https://github.com/magento/magento2/issues/2888) -- Fixed an issue where not all files are pre-compiled
31+
* Various improvements:
32+
* Fixed performance issue on customer edit form
33+
* Fixed performance issue related to swatch module
34+
* Fixed several security-related issues
35+
* Added support of latest USPS API
36+
* Added support of PHP 7.0.2
37+
1738
2.0.0
1839
=============
1940
* Fixed bugs:
@@ -124,7 +145,7 @@
124145
* Added the ability of inline and bulk inline editing in data grids
125146
* WebApi Framework improvements:
126147
* Added the support for store codes in API calls
127-
* Added the ability to update the Magento system to a particular version of Magento
148+
* Added the ability to update the Magento system to a particular version of Magento
128149
* Added the ability to enable/disable modules for Magento application
129150
* Added the ability to use maintenance mode
130151
* Introduced the common interface for Webapi payload processors
@@ -162,7 +183,7 @@
162183
* Updated the extensions styles in the Web Installation Wizard
163184
* Added the ability to control access to the setup tool
164185
* Added the Install Components functionality for Web Installation Wizard
165-
* Updated styles
186+
* Updated styles
166187
* Sample Data:
167188
* Improved sample data installation UX
168189
* Updated sample data with Product Heros, color swatches, MAP and rule based product relations
@@ -248,7 +269,7 @@
248269
* [#1418](https://github.com/magento/magento2/issue/1418) -- Items in minicart are not cleared after successful placing an order
249270
* [#1408](https://github.com/magento/magento2/issue/1408) -- Error command cli setup:static-content:deploy
250271
* [#1396](https://github.com/magento/magento2/issue/1396) -- Products are not shown in category right after import
251-
272+
252273
1.0.0-beta
253274
=============
254275
* Framework improvements:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"lib-libxml": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "100.0.2",
13+
"version": "100.0.3",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"magento/framework": "100.0.*"
1414
},
1515
"type": "magento2-module",
16-
"version": "100.0.2",
16+
"version": "100.0.3",
1717
"license": [
1818
"OSL-3.0",
1919
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"magento/framework": "100.0.*"
88
},
99
"type": "magento2-module",
10-
"version": "100.0.2",
10+
"version": "100.0.3",
1111
"license": [
1212
"OSL-3.0",
1313
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"magento/framework": "100.0.*"
1414
},
1515
"type": "magento2-module",
16-
"version": "100.0.2",
16+
"version": "100.0.3",
1717
"license": [
1818
"proprietary"
1919
],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"magento/framework": "100.0.*"
2222
},
2323
"type": "magento2-module",
24-
"version": "100.0.2",
24+
"version": "100.0.3",
2525
"license": [
2626
"OSL-3.0",
2727
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"magento/framework": "100.0.*"
1010
},
1111
"type": "magento2-module",
12-
"version": "100.0.2",
12+
"version": "100.0.3",
1313
"license": [
1414
"OSL-3.0",
1515
"AFL-3.0"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
"magento/module-directory": "100.0.*",
1717
"magento/module-theme": "100.0.*",
1818
"magento/framework": "100.0.*",
19-
"braintree/braintree_php": "2.39.0"
19+
"braintree/braintree_php": "3.7.0"
2020
},
2121
"suggest": {
2222
"magento/module-checkout-agreements": "100.0.*"
2323
},
2424
"type": "magento2-module",
25-
"version": "100.0.2",
25+
"version": "100.0.3",
2626
"license": [
2727
"proprietary"
2828
],

‎app/code/Magento/Bundle/Test/Unit/Model/CartItemProcessorTest.php

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,16 @@ public function testConvertToBuyRequest()
7979
$dataObjectMock = $this->getMock('\Magento\Framework\DataObject');
8080
$optionExtensionMock = $this->getMock(
8181
'\Magento\Quote\Api\Data\ProductOptionExtensionInterface',
82-
['getBundleOptions'],
82+
[
83+
'getBundleOptions',
84+
'getCustomOptions',
85+
'setCustomOptions',
86+
'setBundleOptions',
87+
'getDownloadableOption',
88+
'setDownloadableOption',
89+
'getConfigurableItemOptions',
90+
'setConfigurableItemOptions'
91+
],
8392
[],
8493
'',
8594
false
@@ -128,7 +137,16 @@ public function testProcessProductOptions()
128137
$productOptionMock = $this->getMock('\Magento\Quote\Model\Quote\ProductOption', [], [], '', false);
129138
$optionExtensionMock = $this->getMock(
130139
'\Magento\Quote\Api\Data\ProductOptionExtensionInterface',
131-
['setBundleOptions'],
140+
[
141+
'getBundleOptions',
142+
'getCustomOptions',
143+
'setCustomOptions',
144+
'setBundleOptions',
145+
'getDownloadableOption',
146+
'setDownloadableOption',
147+
'getConfigurableItemOptions',
148+
'setConfigurableItemOptions'
149+
],
132150
[],
133151
'',
134152
false

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"magento/module-bundle-sample-data": "Sample Data version:100.0.*"
2525
},
2626
"type": "magento2-module",
27-
"version": "100.0.2",
27+
"version": "100.0.3",
2828
"license": [
2929
"OSL-3.0",
3030
"AFL-3.0"

0 commit comments

Comments
 (0)