Skip to content

Commit ac69cb9

Browse files
author
Oleksandr Dubovyk
committed
Merge remote-tracking branch 'origin/develop' into MAGETWO-54163-new
2 parents 3cf4a5f + 73a5230 commit ac69cb9

File tree

284 files changed

+3713
-1401
lines changed

Some content is hidden

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

284 files changed

+3713
-1401
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2.1.0
2+
=============
3+
To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](http://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")
4+
15
2.0.0
26
=============
37
* Fixed bugs:

‎app/code/Magento/AdminNotification/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.6.0|7.0.2|~7.0.6",
6-
"magento/module-store": "100.1.*",
7-
"magento/module-backend": "100.1.*",
8-
"magento/module-media-storage": "100.1.*",
9-
"magento/framework": "100.1.*",
6+
"magento/module-store": "100.2.*",
7+
"magento/module-backend": "100.2.*",
8+
"magento/module-media-storage": "100.2.*",
9+
"magento/framework": "100.2.*",
1010
"lib-libxml": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "100.1.0-rc2",
13+
"version": "100.2.0-dev",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.6.0|7.0.2|~7.0.6",
6-
"magento/module-catalog": "101.0.*",
7-
"magento/module-catalog-inventory": "100.1.*",
8-
"magento/module-eav": "100.1.*",
9-
"magento/module-import-export": "100.1.*",
10-
"magento/module-catalog-import-export": "100.1.*",
11-
"magento/module-customer": "100.1.*",
12-
"magento/module-store": "100.1.*",
13-
"magento/framework": "100.1.*"
6+
"magento/module-catalog": "101.1.*",
7+
"magento/module-catalog-inventory": "100.2.*",
8+
"magento/module-eav": "100.2.*",
9+
"magento/module-import-export": "100.2.*",
10+
"magento/module-catalog-import-export": "100.2.*",
11+
"magento/module-customer": "100.2.*",
12+
"magento/module-store": "100.2.*",
13+
"magento/framework": "100.2.*"
1414
},
1515
"type": "magento2-module",
16-
"version": "100.1.0-rc2",
16+
"version": "100.2.0-dev",
1717
"license": [
1818
"OSL-3.0",
1919
"AFL-3.0"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.6.0|7.0.2|~7.0.6",
6-
"magento/module-backend": "100.1.*",
7-
"magento/framework": "100.1.*"
6+
"magento/module-backend": "100.2.*",
7+
"magento/framework": "100.2.*"
88
},
99
"type": "magento2-module",
10-
"version": "100.1.0-rc2",
10+
"version": "100.2.0-dev",
1111
"license": [
1212
"OSL-3.0",
1313
"AFL-3.0"

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.6.0|7.0.2|~7.0.6",
6-
"magento/module-sales": "100.1.*",
7-
"magento/module-store": "100.1.*",
8-
"magento/module-quote": "100.1.*",
9-
"magento/module-checkout": "100.1.*",
10-
"magento/module-backend": "100.1.*",
11-
"magento/module-payment": "100.1.*",
12-
"magento/module-catalog": "101.0.*",
13-
"magento/framework": "100.1.*"
6+
"magento/module-sales": "100.2.*",
7+
"magento/module-store": "100.2.*",
8+
"magento/module-quote": "100.2.*",
9+
"magento/module-checkout": "100.2.*",
10+
"magento/module-backend": "100.2.*",
11+
"magento/module-payment": "100.2.*",
12+
"magento/module-catalog": "101.1.*",
13+
"magento/framework": "100.2.*"
1414
},
1515
"type": "magento2-module",
16-
"version": "100.1.0-rc2",
16+
"version": "100.2.0-dev",
1717
"license": [
1818
"proprietary"
1919
],

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.6.0|7.0.2|~7.0.6",
6-
"magento/module-store": "100.1.*",
7-
"magento/module-directory": "100.1.*",
8-
"magento/module-developer": "100.1.*",
9-
"magento/module-eav": "100.1.*",
10-
"magento/module-theme": "100.1.*",
11-
"magento/module-reports": "100.1.*",
12-
"magento/module-sales": "100.1.*",
13-
"magento/module-quote": "100.1.*",
14-
"magento/module-catalog": "101.0.*",
15-
"magento/module-user": "100.1.*",
16-
"magento/module-security": "100.1.*",
17-
"magento/module-backup": "100.1.*",
18-
"magento/module-customer": "100.1.*",
19-
"magento/module-translation": "100.1.*",
20-
"magento/module-require-js": "100.1.*",
21-
"magento/module-config": "100.1.*",
22-
"magento/framework": "100.1.*"
6+
"magento/module-store": "100.2.*",
7+
"magento/module-directory": "100.2.*",
8+
"magento/module-developer": "100.2.*",
9+
"magento/module-eav": "100.2.*",
10+
"magento/module-theme": "100.2.*",
11+
"magento/module-reports": "100.2.*",
12+
"magento/module-sales": "100.2.*",
13+
"magento/module-quote": "100.2.*",
14+
"magento/module-catalog": "101.1.*",
15+
"magento/module-user": "100.2.*",
16+
"magento/module-security": "100.2.*",
17+
"magento/module-backup": "100.2.*",
18+
"magento/module-customer": "100.2.*",
19+
"magento/module-translation": "100.2.*",
20+
"magento/module-require-js": "100.2.*",
21+
"magento/module-config": "100.2.*",
22+
"magento/framework": "100.2.*"
2323
},
2424
"type": "magento2-module",
25-
"version": "100.1.0-rc2",
25+
"version": "100.2.0-dev",
2626
"license": [
2727
"OSL-3.0",
2828
"AFL-3.0"

‎app/code/Magento/Backup/Model/Fs/Collection.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,10 @@ protected function _generateRow($filename)
110110
$row[$key] = $value;
111111
}
112112
$row['size'] = $this->_varDirectory->stat($this->_varDirectory->getRelativePath($filename))['size'];
113-
$row['id'] = $row['time'] . '_' . $row['type'];
113+
if (isset($row['display_name']) && $row['display_name'] == '') {
114+
$row['display_name'] = 'WebSetupWizard';
115+
}
116+
$row['id'] = $row['time'] . '_' . $row['type'] . (isset($row['display_name']) ? $row['display_name'] : '');
114117
return $row;
115118
}
116119
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.6.0|7.0.2|~7.0.6",
6-
"magento/module-store": "100.1.*",
7-
"magento/module-backend": "100.1.*",
8-
"magento/module-cron": "100.1.*",
9-
"magento/framework": "100.1.*"
6+
"magento/module-store": "100.2.*",
7+
"magento/module-backend": "100.2.*",
8+
"magento/module-cron": "100.2.*",
9+
"magento/framework": "100.2.*"
1010
},
1111
"type": "magento2-module",
12-
"version": "100.1.0-rc2",
12+
"version": "100.2.0-dev",
1313
"license": [
1414
"OSL-3.0",
1515
"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.6.0|7.0.2|~7.0.6",
6-
"magento/framework": "100.1.*",
6+
"magento/framework": "100.2.*",
77
"magento/magento-composer-installer": "*",
8-
"magento/module-config": "100.1.*",
9-
"magento/module-directory": "100.1.*",
10-
"magento/module-payment": "100.1.*",
11-
"magento/module-checkout": "100.1.*",
12-
"magento/module-sales": "100.1.*",
13-
"magento/module-backend": "100.1.*",
14-
"magento/module-vault": "100.1.*",
15-
"magento/module-customer": "100.1.*",
16-
"magento/module-catalog": "101.0.*",
17-
"magento/module-quote": "100.1.*",
18-
"magento/module-paypal": "100.1.*",
19-
"magento/module-theme": "100.1.*",
8+
"magento/module-config": "100.2.*",
9+
"magento/module-directory": "100.2.*",
10+
"magento/module-payment": "100.2.*",
11+
"magento/module-checkout": "100.2.*",
12+
"magento/module-sales": "100.2.*",
13+
"magento/module-backend": "100.2.*",
14+
"magento/module-vault": "100.2.*",
15+
"magento/module-customer": "100.2.*",
16+
"magento/module-catalog": "101.1.*",
17+
"magento/module-quote": "100.2.*",
18+
"magento/module-paypal": "100.2.*",
19+
"magento/module-theme": "100.2.*",
2020
"braintree/braintree_php": "3.7.0"
2121
},
2222
"suggest": {
23-
"magento/module-checkout-agreements": "100.1.*"
23+
"magento/module-checkout-agreements": "100.2.*"
2424
},
2525
"type": "magento2-module",
26-
"version": "100.1.0-rc2",
26+
"version": "100.2.0-dev",
2727
"license": [
2828
"proprietary"
2929
],

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,29 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.6.0|7.0.2|~7.0.6",
6-
"magento/module-store": "100.1.*",
7-
"magento/module-catalog": "101.0.*",
8-
"magento/module-tax": "100.1.*",
9-
"magento/module-backend": "100.1.*",
10-
"magento/module-sales": "100.1.*",
11-
"magento/module-checkout": "100.1.*",
12-
"magento/module-catalog-inventory": "100.1.*",
13-
"magento/module-customer": "100.1.*",
14-
"magento/module-catalog-rule": "100.1.*",
15-
"magento/module-eav": "100.1.*",
16-
"magento/module-config": "100.1.*",
17-
"magento/module-gift-message": "100.1.*",
18-
"magento/framework": "100.1.*",
19-
"magento/module-quote": "100.1.*",
20-
"magento/module-media-storage": "100.1.*",
21-
"magento/module-ui": "100.1.*"
6+
"magento/module-store": "100.2.*",
7+
"magento/module-catalog": "101.1.*",
8+
"magento/module-tax": "100.2.*",
9+
"magento/module-backend": "100.2.*",
10+
"magento/module-sales": "100.2.*",
11+
"magento/module-checkout": "100.2.*",
12+
"magento/module-catalog-inventory": "100.2.*",
13+
"magento/module-customer": "100.2.*",
14+
"magento/module-catalog-rule": "100.2.*",
15+
"magento/module-eav": "100.2.*",
16+
"magento/module-config": "100.2.*",
17+
"magento/module-gift-message": "100.2.*",
18+
"magento/framework": "100.2.*",
19+
"magento/module-quote": "100.2.*",
20+
"magento/module-media-storage": "100.2.*",
21+
"magento/module-ui": "100.2.*"
2222
},
2323
"suggest": {
24-
"magento/module-webapi": "100.1.*",
25-
"magento/module-bundle-sample-data": "Sample Data version:100.1.*"
24+
"magento/module-webapi": "100.2.*",
25+
"magento/module-bundle-sample-data": "Sample Data version:100.2.*"
2626
},
2727
"type": "magento2-module",
28-
"version": "100.1.0-rc2",
28+
"version": "100.2.0-dev",
2929
"license": [
3030
"OSL-3.0",
3131
"AFL-3.0"

0 commit comments

Comments
 (0)