Skip to content

Commit 2631119

Browse files
author
Erik Hansen
committed
Merge remote-tracking branch 'upstream/develop' into feature/responsive-email-structure
 Conflicts: app/code/Magento/Email/Model/AbstractTemplate.php app/code/Magento/Email/Model/Template.php app/code/Magento/Email/Model/Template/Filter.php app/code/Magento/Email/Test/Unit/Model/TemplateTest.php app/code/Magento/Newsletter/Model/Queue.php app/code/Magento/Newsletter/Model/Template.php app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php app/code/Magento/Sales/Test/Unit/Model/Email/TemplateTest.php app/code/Magento/Sales/composer.json dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_Email/templates/sample_email_content.phtml dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content.phtml dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content_custom.phtml lib/internal/Magento/Framework/Filter/Template.php
2 parents ee4a029 + 5c5df5f commit 2631119

File tree

1,332 files changed

+24435
-8789
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,332 files changed

+24435
-8789
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: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,42 @@
1+
0.74.0-beta14
2+
=============
3+
* Framework improvements:
4+
* Introduced an ability to uninstall modules which were installed via composer (bin/magento module:uninstall <moduleName>)
5+
* Introduced an ability to uninstall themes (bin/magento theme:uninstall <themeName>)
6+
* Introduced an ability to backup and rollback DB and Media via CLI (bin/magento setup:backup, options are --code, --db or --media)
7+
* Introduced an ability to uninstall language packages (bin/magento i18n:uninstall <languagePack>)
8+
* Introduced API notation for the following modules: Backend, Backup, Cron, Log, PageCache
9+
* Added join processors to search services, joined config for services with extension attributes
10+
* Renamed hidden_tax to discount_tax_compensation
11+
* The customer address entity table was transformed from EAV into a flat model to minimize database operations
12+
* Fixed bugs:
13+
* Fixed an issue where Setup Wizard failed on readiness check when Magento was deployed by composer create-project
14+
* Fixed the local file path disclosure when trying to browse image cache directory
15+
* Fixed an issue where development errors resulted in too many redirects
16+
* Fixed an integration test failure in Reports ViewedTest
17+
* Fixed an issue where it was impossible to save existent Grouped Product with no child items
18+
* Fixed an issue where message "We don't have as many "conf1" as you requested" appeared
19+
* Fixed an issue where second product from bundle product was ordered as separate item after checkout
20+
* Fixed an issue where configs for payments and shippings were not encrypted
21+
* Fixed an issue where Table Rates shipping method did not work
22+
* Fixed an issue where admin could not set locale properly on Account page
23+
* Fixed incomplete generated results of single tenant compiler
24+
* Fixed an issue with full page caching where one set of prices was cached for all customers
25+
* Fixed incorrect urls for private content
26+
* Fixed an issue where it was not possible to assign a product link to another product using API
27+
* Fixed an issue where zipcode was not displayed as required field on Create New Order page
28+
* Fixed the Sample Data re-installation
29+
* Fixed random fails on inventory tab for test CreateSimpleProductEntityTest
30+
* Tests:
31+
* Covered various modules with unit tests
32+
* Functional tests fixed and maintained
33+
* GitHub issues:
34+
* [#1156](https://github.com/magento/magento2/pull/1156) -- Moves common code to all auto-generated Interceptor classes into a trait
35+
* [#1206](https://github.com/magento/magento2/pull/1206) -- Allow modules to live outside of app/code directory
36+
* [#1245](https://github.com/magento/magento2/pull/1245) -- Unable to save product per website wise
37+
* [#1347](https://github.com/magento/magento2/pull/1347) -- Fixed failing Install during integration tests (MAGETWO-38482)
38+
* [#1368](https://github.com/magento/magento2/pull/1368) -- Fix typo in getCurrentCategoryKey
39+
140
0.74.0-beta13
241
=============
342
* Framework improvements:

‎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
);

‎app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ protected function _shouldBeDisplayed()
3434
public function getText()
3535
{
3636
return __(
37-
'One or more media files failed to be synchronized during the media storages synchronization process. '
38-
. 'Refer to the log file for details.'
37+
'We were unable to synchronize one or more media files. Please refer to the log file for details.'
3938
);
4039
}
4140
}

0 commit comments

Comments
 (0)