Merge branch 'develop' into MAGETWO-14674 (d9d1e676) · Commits · KIII-12 / Magento

Commit d9d1e676 authored 10 years ago by

Michael Logvin

Merge branch 'develop' into MAGETWO-14674

Conflicts:
	app/code/Magento/Checkout/Controller/Cart/Index.php

parents ed7ecd34 10d1600d

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/Test/Unit/Model/Menu/Filter/IteratorTest.php 21 additions, 13 deletions

...ento/Backend/Test/Unit/Model/Menu/Filter/IteratorTest.php
app/code/Magento/Catalog/Api/Data/CategoryAttributeInterface.php 0 additions, 2 deletions

...e/Magento/Catalog/Api/Data/CategoryAttributeInterface.php
app/code/Magento/Catalog/Api/Data/ProductAttributeInterface.php 0 additions, 2 deletions

...de/Magento/Catalog/Api/Data/ProductAttributeInterface.php
app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php 14 additions, 3 deletions

...Magento/Catalog/Controller/Adminhtml/Product/Validate.php
app/code/Magento/Catalog/Model/Category/AttributeRepository.php 13 additions, 2 deletions

...de/Magento/Catalog/Model/Category/AttributeRepository.php
app/code/Magento/Catalog/Model/Product/Attribute/Repository.php 4 additions, 1 deletion

...de/Magento/Catalog/Model/Product/Attribute/Repository.php
app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php 0 additions, 1 deletion

.../Catalog/Model/Product/Option/Type/File/ValidatorFile.php
app/code/Magento/Catalog/Model/ProductRepository.php 14 additions, 3 deletions

app/code/Magento/Catalog/Model/ProductRepository.php
app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ValidateTest.php 140 additions, 0 deletions

...g/Test/Unit/Controller/Adminhtml/Product/ValidateTest.php
app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/ProductTest.php 1 addition, 1 deletion

...to/Catalog/Test/Unit/Controller/Adminhtml/ProductTest.php
app/code/Magento/Catalog/Test/Unit/Model/Category/AttributeRepositoryTest.php 21 additions, 8 deletions

...alog/Test/Unit/Model/Category/AttributeRepositoryTest.php
app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php 4 additions, 4 deletions

...alog/Test/Unit/Model/Product/Attribute/RepositoryTest.php
app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php 20 additions, 11 deletions

...Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php
app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml 3 additions, 2 deletions

...dminhtml/templates/catalog/category/checkboxes/tree.phtml
app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml 1 addition, 1 deletion

...alog/view/adminhtml/templates/catalog/category/tree.phtml
app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml 2 additions, 2 deletions

...ew/adminhtml/templates/catalog/category/widget/tree.phtml
app/code/Magento/Checkout/Block/Cart/EmptyCart.php 39 additions, 0 deletions

app/code/Magento/Checkout/Block/Cart/EmptyCart.php
app/code/Magento/Checkout/Block/Cart/ValidationMessages.php 107 additions, 0 deletions

app/code/Magento/Checkout/Block/Cart/ValidationMessages.php
app/code/Magento/Checkout/Controller/Cart/Add.php 0 additions, 2 deletions

app/code/Magento/Checkout/Controller/Cart/Add.php
app/code/Magento/Checkout/Controller/Cart/Addgroup.php 0 additions, 1 deletion

app/code/Magento/Checkout/Controller/Cart/Addgroup.php

with 404 additions and 59 deletions

Please register or to comment

Admin message

Merge branch 'develop' into MAGETWO-14674