Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into bugfix (d4017ada) · Commits · KIII-12 / Magento

Commit d4017ada authored 9 years ago by

Ievgen Shakhsuvarov

Browse files

Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into bugfix

parents 1571c602 8221fc9d

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php 2 additions, 1 deletion

...dle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-input-type.js 22 additions, 16 deletions

...dle/view/adminhtml/web/js/components/bundle-input-type.js
app/code/Magento/CacheInvalidate/etc/events.xml 3 additions, 0 deletions

app/code/Magento/CacheInvalidate/etc/events.xml
app/code/Magento/Catalog/Model/Indexer/Category/AffectCache.php 0 additions, 39 deletions

...de/Magento/Catalog/Model/Indexer/Category/AffectCache.php
app/code/Magento/Catalog/Model/Indexer/Category/Flat.php 27 additions, 1 deletion

app/code/Magento/Catalog/Model/Indexer/Category/Flat.php
app/code/Magento/Catalog/Model/Indexer/Category/Product.php 48 additions, 1 deletion

app/code/Magento/Catalog/Model/Indexer/Category/Product.php
app/code/Magento/Catalog/Model/Indexer/Product/AffectCache.php 0 additions, 39 deletions

...ode/Magento/Catalog/Model/Indexer/Product/AffectCache.php
app/code/Magento/Catalog/Model/Indexer/Product/Category.php 26 additions, 0 deletions

app/code/Magento/Catalog/Model/Indexer/Product/Category.php
app/code/Magento/Catalog/Model/Indexer/Product/Eav.php 29 additions, 0 deletions

app/code/Magento/Catalog/Model/Indexer/Product/Eav.php
app/code/Magento/Catalog/Model/Indexer/Product/Flat.php 29 additions, 0 deletions

app/code/Magento/Catalog/Model/Indexer/Product/Flat.php
app/code/Magento/Catalog/Model/Indexer/Product/Price.php 29 additions, 0 deletions

app/code/Magento/Catalog/Model/Indexer/Product/Price.php
app/code/Magento/Catalog/Setup/UpgradeData.php 6 additions, 0 deletions

app/code/Magento/Catalog/Setup/UpgradeData.php
app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/AffectCacheTest.php 0 additions, 54 deletions

...alog/Test/Unit/Model/Indexer/Category/AffectCacheTest.php
app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/FlatTest.php 43 additions, 0 deletions

...nto/Catalog/Test/Unit/Model/Indexer/Category/FlatTest.php
app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/ProductTest.php 39 additions, 0 deletions

.../Catalog/Test/Unit/Model/Indexer/Category/ProductTest.php
app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/AffectCacheTest.php 0 additions, 54 deletions

...talog/Test/Unit/Model/Indexer/Product/AffectCacheTest.php
app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/CategoryTest.php 44 additions, 0 deletions

.../Catalog/Test/Unit/Model/Indexer/Product/CategoryTest.php
app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/EavTest.php 42 additions, 6 deletions

...gento/Catalog/Test/Unit/Model/Indexer/Product/EavTest.php
app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/FlatTest.php 39 additions, 5 deletions

...ento/Catalog/Test/Unit/Model/Indexer/Product/FlatTest.php
app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php 1 addition, 2 deletions

...g/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php

with 429 additions and 218 deletions

Please register or to comment

Admin message

Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into bugfix