Skip to content

Commit 9c6d21d

Browse files
author
Sergey Semenov
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-38445
2 parents 8613dbf + a4d4b22 commit 9c6d21d

File tree

510 files changed

+8044
-2203
lines changed

Some content is hidden

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

510 files changed

+8044
-2203
lines changed

‎.htaccess

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
############################################
3737
## adjust memory limit
3838

39-
# php_value memory_limit 64M
4039
php_value memory_limit 768M
4140
php_value max_execution_time 18000
4241

‎CHANGELOG.md

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,42 @@
1+
0.74.0-beta12
2+
=============
3+
* MTF Improvements:
4+
* Functional tests maintenance
5+
* Framework improvements:
6+
* Customer entity table was transformed from EAV into a flat model to minimize DB operations
7+
* Improved admin authentication and removed bypass
8+
* Exposed CMS api's as web API
9+
* Fixed bugs:
10+
* Fixed an issue where "Add Item To Return" button became disabled after required item fields were filled on Frontend
11+
* Fixed an issue with fatal error during place order with non default time zone
12+
* Fixed an issue where it was not possible to filter backups on name
13+
* Fixed an issue where routeIdType did not allow numbers
14+
* Fixed an issue with discounted prices for fixed bundle product
15+
* Fixed an issue with catalog prices not including custom option prices
16+
* Fixed an issue with tier prices being displayed 4 characters
17+
* Fixed an issue with extra FPT labels in mini shopping cart
18+
* Fixed an issue where it was not possible to place orders for products with FPT and catalog prices including tax
19+
* Fixed an issue with FPT attribute being required when creating product
20+
* Fixed an issue where final price was not recalculated after selecting product options
21+
* Fixed an issue where tax labels were not displayed for Bundle options on 'multi-select' and 'dropdown' controls
22+
* Fixed an issue where filters were not shown on product reviews report grid
23+
* Fixed an issue where second customer address was not deleted from customer account
24+
* Fixed an issue where custom options pop-up was still displayed after submit
25+
* Fixed an issue where Second Product was not added to Shopping Cart from Wishlist at first atempt
26+
* Fixed an issue where customer invalid email message was not displayed
27+
* Fixed an issue where All Access Tokens for Customer without Tokens could not be revoked
28+
* Fixed an issue where it was impossible to add Product to Shopping Cart from shared Wishlist
29+
* Magento_Sendfriend module should have upper case 'F'
30+
* Fixed set of issues with Ui module
31+
* Fixed JavaScript error on Invoice creation page
32+
* Various improvements:
33+
* Hide payment credentials in debug log
34+
* Simplification of Payment Configuration
35+
* Introduced new Dialog widget
36+
* Github issues:
37+
* [#1330](https://github.com/magento/magento2/pull/1330) -- Removing unused memory limit in htaccess
38+
* [#1307](https://github.com/magento/magento2/pull/1307) -- Corrected a sentence by removing a word
39+
140
0.74.0-beta11
241
=============
342
* Framework improvements:

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ After verifying your prerequisites, perform the following tasks in order to prep
6161
<h2>Contributing to the Magento 2 code base</h2>
6262
Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
6363

64-
To make learn about how to make a contribution, click [here][1].
64+
To learn about how to make a contribution, click [here][1].
6565

6666
To learn about issues, click [here][2]. To open an issue, click [here][3].
6767

‎app/code/Magento/AdminNotification/Model/Feed.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class Feed extends \Magento\Framework\Model\AbstractModel
7373
* @param \Magento\Framework\App\ProductMetadataInterface $productMetadata
7474
* @param \Magento\Framework\UrlInterface $urlBuilder
7575
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
76-
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
76+
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
7777
* @param array $data
7878
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
7979
*/
@@ -87,7 +87,7 @@ public function __construct(
8787
\Magento\Framework\App\ProductMetadataInterface $productMetadata,
8888
\Magento\Framework\UrlInterface $urlBuilder,
8989
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
90-
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
90+
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
9191
array $data = []
9292
) {
9393
parent::__construct($context, $registry, $resource, $resourceCollection, $data);

‎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.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta11",
7-
"magento/module-backend": "0.74.0-beta11",
8-
"magento/module-media-storage": "0.74.0-beta11",
9-
"magento/framework": "0.74.0-beta11",
6+
"magento/module-store": "0.74.0-beta12",
7+
"magento/module-backend": "0.74.0-beta12",
8+
"magento/module-media-storage": "0.74.0-beta12",
9+
"magento/framework": "0.74.0-beta12",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.74.0-beta11",
14+
"version": "0.74.0-beta12",
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.5.0|~5.6.0",
6-
"magento/module-backend": "0.74.0-beta11",
7-
"magento/framework": "0.74.0-beta11",
6+
"magento/module-backend": "0.74.0-beta12",
7+
"magento/framework": "0.74.0-beta12",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.74.0-beta11",
11+
"version": "0.74.0-beta12",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Backend/Helper/Dashboard/Data.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
class Data extends \Magento\Framework\App\Helper\AbstractHelper
1515
{
1616
/**
17-
* @var \Magento\Framework\Data\Collection\Db
17+
* @var \MagentoFrameworkDataCollectionAbstractDb
1818
*/
1919
protected $_stores;
2020

@@ -48,7 +48,7 @@ public function __construct(
4848
/**
4949
* Retrieve stores configured in system.
5050
*
51-
* @return \Magento\Framework\Data\Collection\Db
51+
* @return \MagentoFrameworkDataCollectionAbstractDb
5252
*/
5353
public function getStores()
5454
{

‎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.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta11",
7-
"magento/module-directory": "0.74.0-beta11",
8-
"magento/module-developer": "0.74.0-beta11",
9-
"magento/module-eav": "0.74.0-beta11",
10-
"magento/module-cron": "0.74.0-beta11",
11-
"magento/module-theme": "0.74.0-beta11",
12-
"magento/module-reports": "0.74.0-beta11",
13-
"magento/module-sales": "0.74.0-beta11",
14-
"magento/module-quote": "0.74.0-beta11",
15-
"magento/module-catalog": "0.74.0-beta11",
16-
"magento/module-user": "0.74.0-beta11",
17-
"magento/module-backup": "0.74.0-beta11",
18-
"magento/module-customer": "0.74.0-beta11",
19-
"magento/module-translation": "0.74.0-beta11",
20-
"magento/module-require-js": "0.74.0-beta11",
21-
"magento/module-config": "0.74.0-beta11",
22-
"magento/framework": "0.74.0-beta11",
6+
"magento/module-store": "0.74.0-beta12",
7+
"magento/module-directory": "0.74.0-beta12",
8+
"magento/module-developer": "0.74.0-beta12",
9+
"magento/module-eav": "0.74.0-beta12",
10+
"magento/module-cron": "0.74.0-beta12",
11+
"magento/module-theme": "0.74.0-beta12",
12+
"magento/module-reports": "0.74.0-beta12",
13+
"magento/module-sales": "0.74.0-beta12",
14+
"magento/module-quote": "0.74.0-beta12",
15+
"magento/module-catalog": "0.74.0-beta12",
16+
"magento/module-user": "0.74.0-beta12",
17+
"magento/module-backup": "0.74.0-beta12",
18+
"magento/module-customer": "0.74.0-beta12",
19+
"magento/module-translation": "0.74.0-beta12",
20+
"magento/module-require-js": "0.74.0-beta12",
21+
"magento/module-config": "0.74.0-beta12",
22+
"magento/framework": "0.74.0-beta12",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "0.74.0-beta11",
26+
"version": "0.74.0-beta12",
2727
"license": [
2828
"OSL-3.0",
2929
"AFL-3.0"

‎app/code/Magento/Backup/Model/Config/Backend/Cron.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class Cron extends \Magento\Framework\App\Config\Value
3434
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
3535
* @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
3636
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
37-
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
37+
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
3838
* @param string $runModelPath
3939
* @param array $data
4040
*/
@@ -44,7 +44,7 @@ public function __construct(
4444
\Magento\Framework\App\Config\ScopeConfigInterface $config,
4545
\Magento\Framework\App\Config\ValueFactory $configValueFactory,
4646
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
47-
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
47+
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
4848
$runModelPath = '',
4949
array $data = []
5050
) {

‎app/code/Magento/Backup/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.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta11",
7-
"magento/module-backend": "0.74.0-beta11",
8-
"magento/module-cron": "0.74.0-beta11",
9-
"magento/framework": "0.74.0-beta11",
6+
"magento/module-store": "0.74.0-beta12",
7+
"magento/module-backend": "0.74.0-beta12",
8+
"magento/module-cron": "0.74.0-beta12",
9+
"magento/framework": "0.74.0-beta12",
1010
"magento/magento-composer-installer": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "0.74.0-beta11",
13+
"version": "0.74.0-beta12",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

0 commit comments

Comments
 (0)