Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
8e43c07
FIX fo rissue #15510 - First PDF download / export after login
phoenix128 May 26, 2018
07f4c53
Added additional headers for avoid customer data caching
rogyar Jun 4, 2018
8bacebe
Removed unnecessary css.
chirag-wagento Jun 5, 2018
1206e78
change for : Prevent multiple add-to-cart initializations in case of …
viral-wagento Jun 5, 2018
1fcd1a4
ENGCOM-1848: [Backport] Prevent multiple add-to-cart initializations …
magento-engcom-team Jun 5, 2018
5fda0a5
ENGCOM-1849: [Backport] [Resolved : Styling <select> by changing less…
magento-engcom-team Jun 5, 2018
79fa797
ENGCOM-1854: [Backport] Removed unnecessary css. #3 #15797
magento-engcom-team Jun 5, 2018
71fb481
ENGCOM-1859: [Backport] FIX fo rissue #15510 - First PDF download / e…
magento-engcom-team Jun 5, 2018
2030906
ENGCOM-1865: [Backport] Added additional headers for avoiding custome…
magento-engcom-team Jun 5, 2018
68e19af
Fix for issue 911 found on MSI project - Cannot read property source_…
phoenix128 Apr 22, 2018
1d20361
ENGCOM-1868: [Backport] Fix for issue 911 found on MSI project - Cann…
magento-engcom-team Jun 5, 2018
8b91a72
ENGCOM-1859: [Backport] FIX fo rissue #15510 - First PDF download / e…
Jun 5, 2018
2073969
ENGCOM-1854: [Backport] Removed unnecessary css. #3 #15797
Jun 5, 2018
4fa06dd
ENGCOM-1849: [Backport] [Resolved : Styling <select> by changing less…
Jun 5, 2018
d1b9600
ENGCOM-1848: [Backport] Prevent multiple add-to-cart initializations …
Jun 5, 2018
e09462d
Fixed return type hinting in DocBlocks for Wishlist module
rogyar Jun 5, 2018
71a2f36
ENGCOM-1879: [Backport 2.1] Fixed return type hinting in DocBlocks fo…
magento-engcom-team Jun 5, 2018
cd5ad5d
ENGCOM-1879: [Backport 2.1] Fixed return type hinting in DocBlocks fo…
Jun 6, 2018
7e2022c
ENGCOM-1868: [Backport] Fix for issue 911 found on MSI project - Cann…
Jun 6, 2018
b752999
ENGCOM-1865: [Backport] Added additional headers for avoiding custome…
Jun 6, 2018
1b810a5
ENGCOM-1849: [Backport] Resolved : Styling select by changing less va…
Jun 6, 2018
c07e5bb
:arrows_clockwise: [EngCom] Public Pull Requests - 2.1-develop
VladimirZaets Jun 6, 2018
5b34517
hitesh-wagento Jun 7, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/code/Magento/Backend/App/AbstractAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
$this->_view->loadLayout(['default', 'adminhtml_denied'], true, true, false);
$this->_view->renderLayout();
$this->_request->setDispatched(true);

return $this->_response;
}

Expand All @@ -223,6 +224,11 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)

$this->_processLocaleSettings();

// Need to preload isFirstPageAfterLogin (see https://github.com/magento/magento2/issues/15510)
if ($this->_auth->isLoggedIn()) {
$this->_auth->getAuthStorage()->isFirstPageAfterLogin();
}

return parent::dispatch($request);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ define([

_bindSubmit: function() {
var self = this;
if (this.element.data('catalog-addtocart-initialized')) {
return;
}
this.element.data('catalog-addtocart-initialized', 1);
this.element.on('submit', function(e) {
e.preventDefault();
self.submitForm($(this));
Expand Down
2 changes: 2 additions & 0 deletions app/code/Magento/Customer/Controller/Section/Load.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ public function execute()
{
/** @var \Magento\Framework\Controller\Result\Json $resultJson */
$resultJson = $this->resultJsonFactory->create();
$resultJson->setHeader('Cache-Control', 'max-age=0, must-revalidate, no-cache, no-store', true);
$resultJson->setHeader('Pragma', 'no-cache', true);
try {
$sectionNames = $this->getRequest()->getParam('sections');
$sectionNames = $sectionNames ? array_unique(\explode(',', $sectionNames)) : null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,8 @@ define([
* @param {String|Number} recordId
*/
deleteRecord: function (index, recordId) {
this._super();

this.updateInsertData(recordId);
this._super();
},

/**
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Wishlist/Block/Rss/EmailLink.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class EmailLink extends Link
protected $_template = 'rss/email.phtml';

/**
* @return string
* @return array
*/
protected function getLinkParams()
{
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Wishlist/Block/Rss/Link.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public function isRssAllowed()
}

/**
* @return string
* @return array
*/
protected function getLinkParams()
{
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Wishlist/Helper/Data.php
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ public function isAllowInCart()
/**
* Retrieve customer name
*
* @return string|void
* @return string|null
*/
public function getCustomerName()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@

.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
.product.data.items {
.lib-data-tabs(
@_tab-content-border-top-status: true
);
.lib-data-tabs();
}
}

Expand Down
10 changes: 10 additions & 0 deletions app/design/frontend/Magento/blank/web/css/source/_variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,16 @@
@font-family-name__base: 'Open Sans';
@font-family__base: @font-family-name__base, @font-family__sans-serif;

//
// Sections variables
// _____________________________________________

//
// Tabs
// ---------------------------------------------
@tab-content__border-top-status: true;


//
// Sidebar
// ---------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
&:last-child {
margin-bottom: 0;
}

&.primary {
// &:extend(.abs-button-l all);
}
}

&:last-child {
Expand Down
4 changes: 0 additions & 4 deletions app/design/frontend/Magento/luma/web/css/source/_forms.less
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,7 @@
.select-styling() {
.lib-css(appearance, none, 1);
appearance: none;
background: @select__background url('../images/select-bg.svg') no-repeat 100% 45%;
background-size: 30px 60px;
border: 1px solid @border-color__base;
height: 32px;
padding-right: 25px;
text-indent: .01em;
text-overflow: '';

Expand Down
7 changes: 7 additions & 0 deletions app/design/frontend/Magento/luma/web/css/source/_theme.less
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,13 @@
// Forms
// ---------------------------------------------


// Select
@select__background: @form-element-input__background url('../images/select-bg.svg') no-repeat 100% 45%;
@select__border: 1px solid @border-color__base;
@select__height: 32px;
@select__padding: 4px 25px @indent__xs @indent__s;

// Form fieldset
@form-fieldset-legend__font-size: 18px;
@form-fieldset-legend__font-weight: @font-weight__light;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
private function validatePropertiesSorting(PHP_CodeSniffer_File $phpcsFile, $stackPtr, array $properties)
{
// Fix needed for cases when incorrect properties passed for validation due to bug in PHP tokens.
$symbolsForSkip = ['(', 'block'];
$symbolsForSkip = ['(', 'block', 'field'];
$properties = array_filter(
$properties,
function ($var) use ($symbolsForSkip) {
Expand Down
2 changes: 1 addition & 1 deletion lib/web/css/source/lib/variables/_forms.less
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
@select__disabled__font-style: @form-element-input__disabled__font-style;

// Focus state
@select__focus__background: @form-element-input__focus__background;
@select__focus__background: false;
@select__focus__border: @form-element-input__focus__border;
@select__focus__color: @form-element-input__focus__color;
@select__focus__font-style: @form-element-input__focus__font-style;
Expand Down