Merge branch 'develop' of https://github.com/magento/magento2ce into MAGETWO-48516 (3e5f770e) · Commits · KIII-12 / Magento

There was an error fetching the commit references. Please try again later.

Commit 3e5f770e authored 8 years ago by

Oleh Posyniak

Browse files

Merge branch 'develop' of https://github.com/magento/magento2ce into MAGETWO-48516

parents f2afc3b8 5ffafe22

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/CatalogImportExport/Model/Import/Product.php 115 additions, 30 deletions

...code/Magento/CatalogImportExport/Model/Import/Product.php
app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Media.php 5 additions, 10 deletions

...alogImportExport/Model/Import/Product/Validator/Media.php
app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/MediaTest.php 26 additions, 3 deletions

...rt/Test/Unit/Model/Import/Product/Validator/MediaTest.php
app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php 37 additions, 0 deletions

...atalogImportExport/Test/Unit/Model/Import/ProductTest.php
app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php 6 additions, 1 deletion

...Rewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php 23 additions, 3 deletions

app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
app/code/Magento/Cms/Setup/UpgradeData.php 7 additions, 1 deletion

app/code/Magento/Cms/Setup/UpgradeData.php
app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/SaveTest.php 67 additions, 107 deletions

...ento/Cms/Test/Unit/Controller/Adminhtml/Page/SaveTest.php
app/code/Magento/CmsUrlRewrite/Test/Unit/Model/CmsPageUrlRewriteGeneratorTest.php 133 additions, 0 deletions

...ewrite/Test/Unit/Model/CmsPageUrlRewriteGeneratorTest.php
app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php 39 additions, 39 deletions

.../Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php
app/code/Magento/Customer/Model/Account/Redirect.php 12 additions, 2 deletions

app/code/Magento/Customer/Model/Account/Redirect.php
app/code/Magento/Customer/Model/Url.php 35 additions, 4 deletions

app/code/Magento/Customer/Model/Url.php
app/code/Magento/Customer/Test/Unit/Model/Account/RedirectTest.php 14 additions, 1 deletion

...Magento/Customer/Test/Unit/Model/Account/RedirectTest.php
app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml 1 addition, 3 deletions

...dminhtml/templates/order/create/billing/method/form.phtml
app/code/Magento/SampleData/Model/Dependency.php 4 additions, 0 deletions

app/code/Magento/SampleData/Model/Dependency.php
dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml 16 additions, 0 deletions

.../tests/app/Magento/Backend/Test/Repository/ConfigData.xml
dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageFormSingleStoreMode.php 40 additions, 0 deletions

.../Cms/Test/Constraint/AssertCmsPageFormSingleStoreMode.php
dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.php 32 additions, 1 deletion

...app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.php
dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.xml 12 additions, 0 deletions

...app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.xml
dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Category/ProductTest.php 2 additions, 1 deletion

...te/Magento/Catalog/Model/Indexer/Category/ProductTest.php

with 626 additions and 206 deletions

Please register or to comment

Admin message

Merge branch 'develop' of https://github.com/magento/magento2ce into MAGETWO-48516