Merge remote-tracking branch 'origin/MAGETWO-43646' into MPI-BUGFIXES (9bca98c4) · Commits · KIII-12 / Magento

Commit 9bca98c4 authored 9 years ago by

Viktor Tymchynskyi

Browse files

Merge remote-tracking branch 'origin/MAGETWO-43646' into MPI-BUGFIXES

parents d37da657 b2ca24c1

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Deploy/Model/Deployer.php 46 additions, 16 deletions

app/code/Magento/Deploy/Model/Deployer.php
app/code/Magento/Deploy/etc/di.xml 7 additions, 0 deletions

app/code/Magento/Deploy/etc/di.xml
app/code/Magento/Developer/Console/Command/CssDeployCommand.php 13 additions, 18 deletions

...de/Magento/Developer/Console/Command/CssDeployCommand.php
app/code/Magento/Developer/Test/Unit/Console/Command/CssDeployCommandTest.php 23 additions, 21 deletions

...eloper/Test/Unit/Console/Command/CssDeployCommandTest.php
app/code/Magento/Developer/etc/di.xml 32 additions, 44 deletions

app/code/Magento/Developer/etc/di.xml
app/code/Magento/Email/Model/Template/Filter.php 6 additions, 4 deletions

app/code/Magento/Email/Model/Template/Filter.php
app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php 1 addition, 1 deletion

...ode/Magento/Email/Test/Unit/Model/Template/FilterTest.php
app/code/Magento/Translation/etc/di.xml 7 additions, 5 deletions

app/code/Magento/Translation/etc/di.xml
dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php 3 additions, 3 deletions

...ion/testsuite/Magento/Email/Model/Template/FilterTest.php
dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/Less/OyejorgeTest.php 0 additions, 62 deletions

.../Framework/Css/PreProcessor/Adapter/Less/OyejorgeTest.php
dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/Less/_files/cache/lib/nested/import.less 0 additions, 6 deletions

...rocessor/Adapter/Less/_files/cache/lib/nested/import.less
dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/Less/_files/cache/lib/oyejorge.less 0 additions, 6 deletions

.../PreProcessor/Adapter/Less/_files/cache/lib/oyejorge.less
dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/Less/_files/nested/import.less 0 additions, 6 deletions

...k/Css/PreProcessor/Adapter/Less/_files/nested/import.less
dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/Less/_files/oyejorge.css 0 additions, 6 deletions

...amework/Css/PreProcessor/Adapter/Less/_files/oyejorge.css
dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/Less/_files/oyejorge.less 0 additions, 74 deletions

...mework/Css/PreProcessor/Adapter/Less/_files/oyejorge.less
dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/Less/_files/oyejorge_dev.css 0 additions, 50 deletions

...ork/Css/PreProcessor/Adapter/Less/_files/oyejorge_dev.css
lib/internal/Magento/Framework/Css/PreProcessor/Adapter/Less/Processor.php 92 additions, 0 deletions

...nto/Framework/Css/PreProcessor/Adapter/Less/Processor.php
lib/internal/Magento/Framework/Css/PreProcessor/FileGenerator.php 0 additions, 149 deletions

...rnal/Magento/Framework/Css/PreProcessor/FileGenerator.php
lib/internal/Magento/Framework/Css/PreProcessor/Instruction/Import.php 15 additions, 2 deletions

...Magento/Framework/Css/PreProcessor/Instruction/Import.php
lib/internal/Magento/Framework/Css/PreProcessor/Less.php 0 additions, 49 deletions

lib/internal/Magento/Framework/Css/PreProcessor/Less.php

with 245 additions and 522 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'origin/MAGETWO-43646' into MPI-BUGFIXES