Merge pull request #145 from magento-tango/MAGETWO-54836 (c20c8e90) · Commits · KIII-12 / Magento

Commit c20c8e90 authored 8 years ago by

Andrii Kasian Committed by GitHub 8 years ago

Merge pull request #145 from magento-tango/MAGETWO-54836

[Tango] Contribution of bug fixes #2

parents eb98eace 861bced0

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php 27 additions, 5 deletions

...og/Controller/Adminhtml/Product/Initialization/Helper.php
app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php 75 additions, 9 deletions

...ontroller/Adminhtml/Product/Initialization/HelperTest.php
app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php 20 additions, 1 deletion

...g/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
app/code/Magento/Catalog/view/adminhtml/web/template/form/element/helper/custom-option-type-service.html 17 additions, 0 deletions

...plate/form/element/helper/custom-option-type-service.html
app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php 7 additions, 3 deletions

...Magento/CatalogWidget/Block/Product/Widget/Conditions.php
app/code/Magento/CatalogWidget/Test/Unit/Block/Product/Widget/ConditionsTest.php 178 additions, 0 deletions

...gWidget/Test/Unit/Block/Product/Widget/ConditionsTest.php
app/code/Magento/Deploy/Model/Deployer.php 26 additions, 1 deletion

app/code/Magento/Deploy/Model/Deployer.php
app/code/Magento/Developer/Block/Adminhtml/System/Config/WorkflowType.php 31 additions, 0 deletions

.../Developer/Block/Adminhtml/System/Config/WorkflowType.php
app/code/Magento/Developer/Model/Config/Backend/WorkflowType.php 78 additions, 0 deletions

...e/Magento/Developer/Model/Config/Backend/WorkflowType.php
app/code/Magento/Developer/Model/View/Asset/PreProcessor/FrontendCompilation.php 17 additions, 9 deletions

...per/Model/View/Asset/PreProcessor/FrontendCompilation.php
app/code/Magento/Developer/Model/View/Page/Config/ClientSideLessCompilation/Renderer.php 19 additions, 24 deletions

...l/View/Page/Config/ClientSideLessCompilation/Renderer.php
app/code/Magento/Developer/Test/Unit/Block/Adminhtml/System/Config/WorkflowTypeTest.php 101 additions, 0 deletions

...t/Unit/Block/Adminhtml/System/Config/WorkflowTypeTest.php
app/code/Magento/Developer/Test/Unit/Model/Config/Backend/WorkflowTypeTest.php 79 additions, 0 deletions

...loper/Test/Unit/Model/Config/Backend/WorkflowTypeTest.php
app/code/Magento/Developer/Test/Unit/Model/View/Asset/PreProcessor/FrontendCompilationTest.php 10 additions, 5 deletions

...Model/View/Asset/PreProcessor/FrontendCompilationTest.php
app/code/Magento/Developer/composer.json 2 additions, 1 deletion

app/code/Magento/Developer/composer.json
app/code/Magento/Developer/etc/adminhtml/system.xml 2 additions, 0 deletions

app/code/Magento/Developer/etc/adminhtml/system.xml
app/code/Magento/Developer/etc/di.xml 10 additions, 0 deletions

app/code/Magento/Developer/etc/di.xml
app/code/Magento/Developer/etc/module.xml 3 additions, 0 deletions

app/code/Magento/Developer/etc/module.xml
app/code/Magento/Translation/Model/Inline/Parser.php 13 additions, 3 deletions

app/code/Magento/Translation/Model/Inline/Parser.php
app/code/Magento/Translation/Test/Unit/Model/Inline/ParserTest.php 95 additions, 32 deletions

...Magento/Translation/Test/Unit/Model/Inline/ParserTest.php

with 810 additions and 93 deletions

Please register or to comment

Admin message

Merge pull request #145 from magento-tango/MAGETWO-54836