Skip to content

Commit 9a00651

Browse files
author
Yushkin, Dmytro
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-37956
Conflicts: dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
2 parents 4769534 + 0d9ecaa commit 9a00651

File tree

1,371 files changed

+26633
-9492
lines changed

Some content is hidden

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

1,371 files changed

+26633
-9492
lines changed

‎.htaccess

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,6 @@
6565
SecFilterScanPOST Off
6666
</IfModule>
6767

68-
<IfModule mod_headers.c>
69-
############################################
70-
## prevent clickjacking
71-
72-
Header set X-Frame-Options SAMEORIGIN
73-
</IfModule>
74-
7568
<IfModule mod_deflate.c>
7669

7770
############################################
@@ -187,4 +180,4 @@
187180
## If running in cluster environment, uncomment this
188181
## http://developer.yahoo.com/performance/rules.html#etags
189182

190-
#FileETag none
183+
#FileETag none

‎CHANGELOG.md

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,98 @@
1+
0.74.0-beta15
2+
=============
3+
* Framework Improvements:
4+
* Introduced Drag&Drop Columns functionality in scope of Enhanced Data Grids on CMS
5+
* Improved Column Actions functionality in scope of Enhanced Data Grids on CMS
6+
* Adapted Payment\Gateway framework to client requirements
7+
* Removed 'field_expr' option from filters
8+
* Added product details renderer list support on Catalog category page
9+
* Security: Clickjacking solution - introduced X-Frame-Options
10+
* Gift message was moved to shopping cart
11+
* Improved simple products export
12+
* Separated import of advanced prices
13+
* Changed 'updated_at' filter for products export
14+
* Added the link with sample product import file
15+
* Cleared and improved the messages and names in different modules
16+
* Added mbstring extension as a requirement
17+
* Tests
18+
* Increased test coverage for the CatalogInventory, Email and Newsletter modules
19+
* Added wait to form element before filling a value in functional tests
20+
* Increased test coverage of Reports module
21+
* Functional tests were fixed and maintained
22+
* Fixed Bugs:
23+
* Fixed loading of images from database media storage with separate connection
24+
* Eliminated duplication of ComposerInformation class in Magento Framework and Setup Application
25+
* Fixed an error message format inconsistency in theme uninstall command
26+
* Fixed an issue where incorrect action name checks led to customer info leak
27+
* Fixed an issue where /magento_version exposed too detailed version information
28+
* Fixed an issue where generate data failed when table prefix exceeded length of 5
29+
* Fixed an issue where product options were displayed not styled on "Edit Product from Wishlist" Frontend page
30+
* Fixed an issue where payment information was displayed broken on "Order Management" Backend page forms
31+
* Fixed an issue where admin panel pop-ups contained lots of empty space
32+
* Fixed an issue where Customer account form was displayed broken
33+
* Fixed an issue where all text fields were invisible in Backend "Add New Customer" page
34+
* Fixed XSS issues in Magento - wishlist sending
35+
* Fixed an issue where it was unable to specify all values of "Multiple Select" Product Custom Option to purchase
36+
* Fixed an issue where setting a permission for 'ALL Groups' produced an error if other permissions existed
37+
* Fixed an issue where stock was not updated when Stock indexer was in Update on Schedule mode
38+
* Fixed an issue where it was not possible to update stock items of product using API service
39+
* Fixed an issue where Customer review changes in backend were not reflected in frontend until cache was cleared
40+
* Fixed an issue where cache was not updated when changing stock status using mass action
41+
* Fixed an issue where Stock Items API service to return low stock information did not return correct results
42+
* Fixed an issue where found records in global search in Backend could not be selected via keyboard
43+
* Fixed an issue where Category menu items went out of screen when page side was reached
44+
* Fixed an issue where subcategories in menu were shown instantly when user moved mouse quickly
45+
* Fixed an issue where popup header was our of window range while creating group product
46+
* Fixed an issue where region field was absent in customer address form on backend for "United Kingdom" country
47+
* Fixed an ability to edit the Order from Admin panel
48+
* Fixed an issue where email could not be retrieved from \Magento\Quote\Api\Data\AddressInterface after adding an address on OnePageCheckout
49+
* Fixed an issue where Products were not displayed correctly across all storeviews of the catalog
50+
* Github Issues:
51+
* [#1378](https://github.com/magento/magento2/issues/1319) -- jquery-cookie.js is not published by deploy tool in production mode
52+
* [#1314](https://github.com/magento/magento2/pull/1314)-- Fixed a bug where type attribute for tag button was missing
53+
* [#1354](https://github.com/magento/magento2/pull/1354) -- Add gitter.im badge to ReadMe.
54+
* [#1378](https://github.com/magento/magento2/pull/1378) -- Fix incorrect js filename
55+
56+
57+
0.74.0-beta14
58+
=============
59+
* Framework improvements:
60+
* Introduced an ability to uninstall modules which were installed via composer (bin/magento module:uninstall <moduleName>)
61+
* Introduced an ability to uninstall themes (bin/magento theme:uninstall <themeName>)
62+
* Introduced an ability to backup and rollback DB and Media via CLI (bin/magento setup:backup, options are --code, --db or --media)
63+
* Introduced an ability to uninstall language packages (bin/magento i18n:uninstall <languagePack>)
64+
* Introduced API notation for the following modules: Backend, Backup, Cron, Log, PageCache
65+
* Added join processors to search services, joined config for services with extension attributes
66+
* Renamed hidden_tax to discount_tax_compensation
67+
* The customer address entity table was transformed from EAV into a flat model to minimize database operations
68+
* Fixed bugs:
69+
* Fixed an issue where Setup Wizard failed on readiness check when Magento was deployed by composer create-project
70+
* Fixed the local file path disclosure when trying to browse image cache directory
71+
* Fixed an issue where development errors resulted in too many redirects
72+
* Fixed an integration test failure in Reports ViewedTest
73+
* Fixed an issue where it was impossible to save existent Grouped Product with no child items
74+
* Fixed an issue where message "We don't have as many "conf1" as you requested" appeared
75+
* Fixed an issue where second product from bundle product was ordered as separate item after checkout
76+
* Fixed an issue where configs for payments and shippings were not encrypted
77+
* Fixed an issue where Table Rates shipping method did not work
78+
* Fixed an issue where admin could not set locale properly on Account page
79+
* Fixed incomplete generated results of single tenant compiler
80+
* Fixed an issue with full page caching where one set of prices was cached for all customers
81+
* Fixed incorrect urls for private content
82+
* Fixed an issue where it was not possible to assign a product link to another product using API
83+
* Fixed an issue where zipcode was not displayed as required field on Create New Order page
84+
* Fixed the Sample Data re-installation
85+
* Fixed random fails on inventory tab for test CreateSimpleProductEntityTest
86+
* Tests:
87+
* Covered various modules with unit tests
88+
* Functional tests fixed and maintained
89+
* GitHub issues:
90+
* [#1156](https://github.com/magento/magento2/pull/1156) -- Moves common code to all auto-generated Interceptor classes into a trait
91+
* [#1206](https://github.com/magento/magento2/pull/1206) -- Allow modules to live outside of app/code directory
92+
* [#1245](https://github.com/magento/magento2/pull/1245) -- Unable to save product per website wise
93+
* [#1347](https://github.com/magento/magento2/pull/1347) -- Fixed failing Install during integration tests (MAGETWO-38482)
94+
* [#1368](https://github.com/magento/magento2/pull/1368) -- Fix typo in getCurrentCategoryKey
95+
196
0.74.0-beta13
297
=============
398
* Framework improvements:

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=master)](https://travis-ci.org/magento/magento2)
2+
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
23
<h2>Welcome</h2>
34
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
45

‎app/code/Magento/AdminNotification/Block/Window.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ protected function _toHtml()
7676
if ($this->canShow()) {
7777
$this->setHeaderText($this->escapeHtml(__('Incoming Message')));
7878
$this->setCloseText($this->escapeHtml(__('close')));
79-
$this->setReadDetailsText($this->escapeHtml(__('Read details')));
79+
$this->setReadDetailsText($this->escapeHtml(__('Read Details')));
8080
$this->setNoticeMessageText($this->escapeHtml($this->_getLatestItem()->getTitle()));
8181
$this->setNoticeMessageUrl($this->escapeUrl($this->_getLatestItem()->getUrl()));
8282
$this->setSeverityText('critical');

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,6 @@ class Notification extends \Magento\Backend\App\AbstractAction
1414
*/
1515
protected function _isAllowed()
1616
{
17-
switch ($this->getRequest()->getActionName()) {
18-
case 'markAsRead':
19-
$acl = 'Magento_AdminNotification::mark_as_read';
20-
break;
21-
22-
case 'massMarkAsRead':
23-
$acl = 'Magento_AdminNotification::mark_as_read';
24-
break;
25-
26-
case 'remove':
27-
$acl = 'Magento_AdminNotification::adminnotification_remove';
28-
break;
29-
30-
case 'massRemove':
31-
$acl = 'Magento_AdminNotification::adminnotification_remove';
32-
break;
33-
34-
default:
35-
$acl = 'Magento_AdminNotification::show_list';
36-
}
37-
return $this->_authorization->isAllowed($acl);
17+
return $this->_authorization->isAllowed('Magento_AdminNotification::show_list');
3818
}
3919
}

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,12 @@ public function execute()
3636
}
3737
$this->_redirect('adminhtml/*/');
3838
}
39+
40+
/**
41+
* @return bool
42+
*/
43+
protected function _isAllowed()
44+
{
45+
return $this->_authorization->isAllowed('Magento_AdminNotification::mark_as_read');
46+
}
3947
}

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,12 @@ public function execute()
3838
}
3939
$this->_redirect('adminhtml/*/');
4040
}
41+
42+
/**
43+
* @return bool
44+
*/
45+
protected function _isAllowed()
46+
{
47+
return $this->_authorization->isAllowed('Magento_AdminNotification::mark_as_read');
48+
}
4149
}

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,12 @@ public function execute()
3333
}
3434
$this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
3535
}
36+
37+
/**
38+
* @return bool
39+
*/
40+
protected function _isAllowed()
41+
{
42+
return $this->_authorization->isAllowed('Magento_AdminNotification::adminnotification_remove');
43+
}
3644
}

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,12 @@ public function execute()
3535
}
3636
$this->_redirect('adminhtml/*/');
3737
}
38+
39+
/**
40+
* @return bool
41+
*/
42+
protected function _isAllowed()
43+
{
44+
return $this->_authorization->isAllowed('Magento_AdminNotification::adminnotification_remove');
45+
}
3846
}

‎app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public function getText()
120120
{
121121
return __(
122122
'{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure '
123-
. 'URL / Base Secure URL. It is highly recommended to change this value in your Magento '
123+
. 'URL / Base Secure URL. We highly recommend changing this value in your Magento '
124124
. '<a href="%1">configuration</a>.',
125125
$this->_getConfigUrl()
126126
);

0 commit comments

Comments
 (0)