Skip to content

Commit 4070a21

Browse files
author
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/develop' into UI
2 parents f6686e8 + 32e3715 commit 4070a21

File tree

403 files changed

+4073
-3484
lines changed

Some content is hidden

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

403 files changed

+4073
-3484
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ atlassian*
3232
/pub/media/theme/*
3333
/pub/media/theme_customization/*
3434
!/pub/media/theme_customization/.htaccess
35+
/pub/media/wysiwyg/*
36+
!/pub/media/wysiwyg/.htaccess
3537
/pub/media/tmp/*
3638
!/pub/media/tmp/.htaccess
3739
/pub/static/*

‎CHANGELOG.md

Lines changed: 139 additions & 89 deletions
Large diffs are not rendered by default.

‎COPYING.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
22

33
http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
4-
Please see <insert file name of the OSL license> for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
4+
Please see LICENSE.txt for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
55

6-
Subject to Licensee�s payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
6+
Subject to Licensee's payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
77
Please see <insert file name of the MEE license> for the full text of the MEE License or visit http://magento.com/legal/terms/enterprise.

‎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.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta3",
7-
"magento/module-core": "0.42.0-beta3",
8-
"magento/module-backend": "0.42.0-beta3",
9-
"magento/framework": "0.42.0-beta3",
6+
"magento/module-store": "0.42.0-beta4",
7+
"magento/module-core": "0.42.0-beta4",
8+
"magento/module-backend": "0.42.0-beta4",
9+
"magento/framework": "0.42.0-beta4",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta3",
14+
"version": "0.42.0-beta4",
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.4.11|~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.42.0-beta3",
7-
"magento/framework": "0.42.0-beta3",
6+
"magento/module-backend": "0.42.0-beta4",
7+
"magento/framework": "0.42.0-beta4",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.42.0-beta3",
11+
"version": "0.42.0-beta4",
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.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta3",
7-
"magento/module-directory": "0.42.0-beta3",
8-
"magento/module-core": "0.42.0-beta3",
9-
"magento/module-eav": "0.42.0-beta3",
10-
"magento/module-cron": "0.42.0-beta3",
11-
"magento/module-theme": "0.42.0-beta3",
12-
"magento/module-reports": "0.42.0-beta3",
13-
"magento/module-sales": "0.42.0-beta3",
14-
"magento/module-quote": "0.42.0-beta3",
15-
"magento/module-catalog": "0.42.0-beta3",
16-
"magento/module-user": "0.42.0-beta3",
17-
"magento/module-backup": "0.42.0-beta3",
18-
"magento/module-email": "0.42.0-beta3",
19-
"magento/module-customer": "0.42.0-beta3",
20-
"magento/module-translation": "0.42.0-beta3",
21-
"magento/module-require-js": "0.42.0-beta3",
22-
"magento/framework": "0.42.0-beta3",
6+
"magento/module-store": "0.42.0-beta4",
7+
"magento/module-directory": "0.42.0-beta4",
8+
"magento/module-core": "0.42.0-beta4",
9+
"magento/module-eav": "0.42.0-beta4",
10+
"magento/module-cron": "0.42.0-beta4",
11+
"magento/module-theme": "0.42.0-beta4",
12+
"magento/module-reports": "0.42.0-beta4",
13+
"magento/module-sales": "0.42.0-beta4",
14+
"magento/module-quote": "0.42.0-beta4",
15+
"magento/module-catalog": "0.42.0-beta4",
16+
"magento/module-user": "0.42.0-beta4",
17+
"magento/module-backup": "0.42.0-beta4",
18+
"magento/module-email": "0.42.0-beta4",
19+
"magento/module-customer": "0.42.0-beta4",
20+
"magento/module-translation": "0.42.0-beta4",
21+
"magento/module-require-js": "0.42.0-beta4",
22+
"magento/framework": "0.42.0-beta4",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "0.42.0-beta3",
26+
"version": "0.42.0-beta4",
2727
"license": [
2828
"OSL-3.0",
2929
"AFL-3.0"

‎app/code/Magento/Backup/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.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta3",
7-
"magento/module-core": "0.42.0-beta3",
8-
"magento/module-backend": "0.42.0-beta3",
9-
"magento/module-cron": "0.42.0-beta3",
10-
"magento/framework": "0.42.0-beta3",
6+
"magento/module-store": "0.42.0-beta4",
7+
"magento/module-core": "0.42.0-beta4",
8+
"magento/module-backend": "0.42.0-beta4",
9+
"magento/module-cron": "0.42.0-beta4",
10+
"magento/framework": "0.42.0-beta4",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta3",
14+
"version": "0.42.0-beta4",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta3",
7-
"magento/module-catalog": "0.42.0-beta3",
8-
"magento/module-tax": "0.42.0-beta3",
9-
"magento/module-core": "0.42.0-beta3",
10-
"magento/module-backend": "0.42.0-beta3",
11-
"magento/module-sales": "0.42.0-beta3",
12-
"magento/module-checkout": "0.42.0-beta3",
13-
"magento/module-catalog-inventory": "0.42.0-beta3",
14-
"magento/module-customer": "0.42.0-beta3",
15-
"magento/module-catalog-rule": "0.42.0-beta3",
16-
"magento/module-eav": "0.42.0-beta3",
17-
"magento/module-gift-message": "0.42.0-beta3",
18-
"magento/framework": "0.42.0-beta3",
19-
"magento/module-webapi": "0.42.0-beta3",
20-
"magento/module-quote": "0.42.0-beta3",
6+
"magento/module-store": "0.42.0-beta4",
7+
"magento/module-catalog": "0.42.0-beta4",
8+
"magento/module-tax": "0.42.0-beta4",
9+
"magento/module-core": "0.42.0-beta4",
10+
"magento/module-backend": "0.42.0-beta4",
11+
"magento/module-sales": "0.42.0-beta4",
12+
"magento/module-checkout": "0.42.0-beta4",
13+
"magento/module-catalog-inventory": "0.42.0-beta4",
14+
"magento/module-customer": "0.42.0-beta4",
15+
"magento/module-catalog-rule": "0.42.0-beta4",
16+
"magento/module-eav": "0.42.0-beta4",
17+
"magento/module-gift-message": "0.42.0-beta4",
18+
"magento/framework": "0.42.0-beta4",
19+
"magento/module-webapi": "0.42.0-beta4",
20+
"magento/module-quote": "0.42.0-beta4",
2121
"magento/magento-composer-installer": "*"
2222
},
2323
"type": "magento2-module",
24-
"version": "0.42.0-beta3",
24+
"version": "0.42.0-beta4",
2525
"license": [
2626
"OSL-3.0",
2727
"AFL-3.0"

‎app/code/Magento/Captcha/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.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta3",
7-
"magento/module-customer": "0.42.0-beta3",
8-
"magento/module-checkout": "0.42.0-beta3",
9-
"magento/module-core": "0.42.0-beta3",
10-
"magento/module-backend": "0.42.0-beta3",
11-
"magento/framework": "0.42.0-beta3",
6+
"magento/module-store": "0.42.0-beta4",
7+
"magento/module-customer": "0.42.0-beta4",
8+
"magento/module-checkout": "0.42.0-beta4",
9+
"magento/module-core": "0.42.0-beta4",
10+
"magento/module-backend": "0.42.0-beta4",
11+
"magento/framework": "0.42.0-beta4",
1212
"magento/magento-composer-installer": "*"
1313
},
1414
"type": "magento2-module",
15-
"version": "0.42.0-beta3",
15+
"version": "0.42.0-beta4",
1616
"license": [
1717
"OSL-3.0",
1818
"AFL-3.0"

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ public function execute()
5555

5656
$attribute->setAttributeSetId($attributeSet->getId())->loadEntityAttributeIdBySet();
5757

58-
$attribute->setEntityTypeId($attributeSet->getEntityTypeId())
59-
->setAttributeSetId($request->getParam('template_id'))
58+
$attribute->setAttributeSetId($request->getParam('template_id'))
6059
->setAttributeGroupId($attributeGroup->getId())
6160
->setSortOrder('0')
6261
->save();

0 commit comments

Comments
 (0)