Merge branch 'develop' of github.com:magento/magento2ce into iteration2-pr-new (5ce919bc) · Commits · KIII-12 / Magento

Commit 5ce919bc authored 8 years ago by

Vadim Zubovich

Browse files

Merge branch 'develop' of github.com:magento/magento2ce into iteration2-pr-new

parents debfdaea 5ffafe22

No related merge requests found

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/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml 2 additions, 1 deletion

...nd/templates/product/view/type/options/configurable.phtml
app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js 43 additions, 37 deletions

.../ConfigurableProduct/view/frontend/web/js/configurable.js
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
app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml 2 additions, 2 deletions

...tches/view/frontend/templates/product/view/renderer.phtml
app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js 36 additions, 19 deletions

.../Magento/Swatches/view/frontend/web/js/swatch-renderer.js
app/design/frontend/Magento/luma/etc/view.xml 1 addition, 4 deletions

app/design/frontend/Magento/luma/etc/view.xml

with 608 additions and 267 deletions

Please register or to comment

Admin message

Merge branch 'develop' of github.com:magento/magento2ce into iteration2-pr-new