Merge pull request #40 from magento-mpi/public-pulls (ea1c57c5) · Commits · KIII-12 / Magento

Commit ea1c57c5 authored 10 years ago by

Vladimir Pelipenko

Merge pull request #40 from magento-mpi/public-pulls

[Github] Merge public Github commits

parents 5dde4a39 2da98dee

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php 8 additions, 8 deletions

...to/Catalog/Model/Product/Attribute/Backend/GroupPrice.php
app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php 3 additions, 3 deletions

...oduct/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php 1 addition, 1 deletion

...nto/Catalog/Model/Product/Attribute/Backend/Tierprice.php
app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/GroupPrice.php 2 additions, 2 deletions

...g/Model/Resource/Product/Attribute/Backend/GroupPrice.php
app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php 2 additions, 2 deletions

...oduct/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.php 2 additions, 2 deletions

...og/Model/Resource/Product/Attribute/Backend/Tierprice.php
app/code/Magento/Catalog/Model/Resource/Setup.php 1 addition, 1 deletion

app/code/Magento/Catalog/Model/Resource/Setup.php
app/code/Magento/Checkout/view/frontend/web/js/region-updater.js 4 additions, 3 deletions

...e/Magento/Checkout/view/frontend/web/js/region-updater.js
app/code/Magento/Ui/DataProvider/Config/FileResolver.php 1 addition, 1 deletion

app/code/Magento/Ui/DataProvider/Config/FileResolver.php
dev/shell/cache.php 3 additions, 0 deletions

dev/shell/cache.php
dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php 1 addition, 1 deletion

...stomer/Test/TestCase/UpdateCustomerFrontendEntityTest.php
dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest/test.csv 1 addition, 0 deletions

...r/Test/TestCase/UpdateCustomerFrontendEntityTest/test.csv
dev/tests/integration/testsuite/Magento/Framework/View/Page/Config/Reader/HtmlTest.php 27 additions, 0 deletions

...te/Magento/Framework/View/Page/Config/Reader/HtmlTest.php
dev/tests/integration/testsuite/Magento/Framework/View/Page/Config/Reader/_files/_layout_update.xml 12 additions, 0 deletions

...amework/View/Page/Config/Reader/_files/_layout_update.xml
dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/GroupPriceTest.php 2 additions, 2 deletions

...testsuite/Magento/Bundle/Pricing/Price/GroupPriceTest.php
dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php 3 additions, 3 deletions

...del/Product/Attribute/Backend/GroupPrice/AbstractTest.php
dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/GroupPriceTest.php 2 additions, 2 deletions

...estsuite/Magento/Catalog/Pricing/Price/GroupPriceTest.php
dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerAppTest.php 11 additions, 7 deletions

.../testsuite/Magento/Framework/App/Cache/ManagerAppTest.php
dev/tests/unit/testsuite/Magento/Framework/View/Layout/Reader/UiComponentTest.php 4 additions, 4 deletions

.../Magento/Framework/View/Layout/Reader/UiComponentTest.php
dev/tests/unit/testsuite/Magento/Ui/DataProvider/Config/FileResolverTest.php 48 additions, 0 deletions

...suite/Magento/Ui/DataProvider/Config/FileResolverTest.php

with 138 additions and 42 deletions

Please register or to comment

Admin message

Merge pull request #40 from magento-mpi/public-pulls