Skip to content

Commit 52a7b11

Browse files
merge magento/1.1-develop into magento-obsessive-owls/PB-273
2 parents 810c07d + 2a210db commit 52a7b11

30 files changed

+2828
-1645
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<!---
2424
https://github.com/magento/magento2ce/pull/<related_pr>
2525
-->
26+
<!-- related pull request placeholder -->
2627

2728
### Checklist
2829
- [ ] PR is green on M2 Quality Portal

.stylelintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"selector-combinator-space-before": "always",
2121
"selector-list-comma-newline-after": "always",
2222
"shorthand-property-no-redundant-values": true,
23-
"string-quotes": "single"
23+
"string-quotes": "single",
24+
"function-calc-no-invalid": null
2425
}
2526
}

app/code/Magento/PageBuilder/Model/Stage/Renderer/WidgetDirective.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,11 @@ public function render(array $params): array
6767
}
6868

6969
try {
70+
$previousStrictMode = $this->directiveFilter->setStrictMode(true);
7071
$result['content'] = $this->directiveFilter
7172
->setStoreId(Store::DEFAULT_STORE_ID)
7273
->filter($this->templateFilter->filter($params['directive']));
74+
$this->directiveFilter->setStrictMode($previousStrictMode);
7375
} catch (\Exception $e) {
7476
$result['error'] = __($e->getMessage());
7577
}

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type-factory.js

Lines changed: 8 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type-menu/hide-show-option.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-group/grid-size.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-group/preview.js

Lines changed: 33 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column/preview.js

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/heading/preview.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/observable-updater.js

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)