Skip to content

Commit 0384bcd

Browse files
author
Mike Weis
committed
Merge remote-tracking branch 'mainline/develop' into develop
Conflicts: app/code/Magento/Tax/Helper/Data.php
2 parents 7ee2df5 + 32e3715 commit 0384bcd

File tree

982 files changed

+11195
-8821
lines changed

Some content is hidden

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

982 files changed

+11195
-8821
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/Block/Widget/Grid/Massaction/AbstractMassaction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/**
1111
* Grid widget massaction block
1212
*
13-
* @method \Magento\Sales\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
13+
* @method \Magento\Quote\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
1414
* @method boolean getHideFormElement()
1515
* @author Magento Core Team <core@magentocommerce.com>
1616
*/

‎app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Grid widget massaction block
1010
*
11-
* @method \Magento\Sales\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
11+
* @method \Magento\Quote\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
1212
* @method boolean getHideFormElement()
1313
* @author Magento Core Team <core@magentocommerce.com>
1414
* @deprecated support Magento 1.x grid massaction implementation

‎app/code/Magento/Backend/Model/Session/Quote.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
2828
/**
2929
* Quote model object
3030
*
31-
* @var \Magento\Sales\Model\Quote
31+
* @var \Magento\Quote\Model\Quote
3232
*/
3333
protected $_quote;
3434

@@ -59,7 +59,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
5959
/**
6060
* Sales quote repository
6161
*
62-
* @var \Magento\Sales\Model\QuoteRepository
62+
* @var \Magento\Quote\Model\QuoteRepository
6363
*/
6464
protected $quoteRepository;
6565

@@ -83,7 +83,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
8383
* @param \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager
8484
* @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
8585
* @param CustomerRepositoryInterface $customerRepository
86-
* @param \Magento\Sales\Model\QuoteRepository $quoteRepository
86+
* @param \Magento\Quote\Model\QuoteRepository $quoteRepository
8787
* @param \Magento\Sales\Model\OrderFactory $orderFactory
8888
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
8989
* @param GroupManagementInterface $groupManagement
@@ -98,7 +98,7 @@ public function __construct(
9898
\Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
9999
\Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
100100
CustomerRepositoryInterface $customerRepository,
101-
\Magento\Sales\Model\QuoteRepository $quoteRepository,
101+
\Magento\Quote\Model\QuoteRepository $quoteRepository,
102102
\Magento\Sales\Model\OrderFactory $orderFactory,
103103
\Magento\Store\Model\StoreManagerInterface $storeManager,
104104
GroupManagementInterface $groupManagement
@@ -127,7 +127,7 @@ public function __construct(
127127
/**
128128
* Retrieve quote model object
129129
*
130-
* @return \Magento\Sales\Model\Quote
130+
* @return \Magento\Quote\Model\Quote
131131
*/
132132
public function getQuote()
133133
{

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

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +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-catalog": "0.42.0-beta3",
15-
"magento/module-user": "0.42.0-beta3",
16-
"magento/module-backup": "0.42.0-beta3",
17-
"magento/module-email": "0.42.0-beta3",
18-
"magento/module-customer": "0.42.0-beta3",
19-
"magento/module-translation": "0.42.0-beta3",
20-
"magento/module-require-js": "0.42.0-beta3",
21-
"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",
2223
"magento/magento-composer-installer": "*"
2324
},
2425
"type": "magento2-module",
25-
"version": "0.42.0-beta3",
26+
"version": "0.42.0-beta4",
2627
"license": [
2728
"OSL-3.0",
2829
"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"

0 commit comments

Comments
 (0)