Merge branch 'develop' of github.com:magento/magento2ce into MPI-bugfixes (9aa84ede) · Commits · KIII-12 / Magento

Commit 9aa84ede authored 8 years ago by

Dmytro Yushkin

Browse files

Merge branch 'develop' of github.com:magento/magento2ce into MPI-bugfixes

parents 3ce8f20b 3bcc1c99

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/Model/View/Result/Redirect.php 2 additions, 1 deletion

app/code/Magento/Backend/Model/View/Result/Redirect.php
app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml 6 additions, 0 deletions

...ackend/view/adminhtml/ui_component/design_config_form.xml
app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/cells/action-delete.html 1 addition, 1 deletion

...inhtml/web/template/dynamic-rows/cells/action-delete.html
app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html 3 additions, 3 deletions

...ackend/view/adminhtml/web/template/dynamic-rows/grid.html
app/code/Magento/Braintree/Gateway/Command/CaptureStrategyCommand.php 17 additions, 8 deletions

...ento/Braintree/Gateway/Command/CaptureStrategyCommand.php
app/code/Magento/Braintree/Test/Unit/Gateway/Command/CaptureStrategyCommandTest.php 1 addition, 1 deletion

.../Test/Unit/Gateway/Command/CaptureStrategyCommandTest.php
app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php 1 addition, 1 deletion

...Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php
app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php 1 addition, 1 deletion

...og/Controller/Adminhtml/Product/Action/Attribute/Save.php
app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilter.php 32 additions, 0 deletions

...ectionProcessor/FilterProcessor/ProductCategoryFilter.php
app/code/Magento/Catalog/Model/CategoryList.php 20 additions, 34 deletions

app/code/Magento/Catalog/Model/CategoryList.php
app/code/Magento/Catalog/Model/Product.php 4 additions, 1 deletion

app/code/Magento/Catalog/Model/Product.php
app/code/Magento/Catalog/Model/ProductRepository.php 29 additions, 16 deletions

app/code/Magento/Catalog/Model/ProductRepository.php
app/code/Magento/Catalog/Test/Unit/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilterTest.php 73 additions, 0 deletions

...onProcessor/FilterProcessor/ProductCategoryFilterTest.php
app/code/Magento/Catalog/Test/Unit/Model/CategoryListTest.php 13 additions, 30 deletions

...code/Magento/Catalog/Test/Unit/Model/CategoryListTest.php
app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php 20 additions, 69 deletions

...Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php
app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php 84 additions, 0 deletions

app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php 207 additions, 1 deletion

...st/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php
app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php 12 additions, 1 deletion

...nto/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
app/code/Magento/Catalog/etc/di.xml 26 additions, 0 deletions

app/code/Magento/Catalog/etc/di.xml
app/code/Magento/Catalog/view/adminhtml/web/template/form/element/action-delete.html 1 addition, 1 deletion

...ew/adminhtml/web/template/form/element/action-delete.html

with 553 additions and 169 deletions

Please register or to comment

Admin message

Merge branch 'develop' of github.com:magento/magento2ce into MPI-bugfixes