Merge remote-tracking branch 'origin/develop' into MAGETWO-60155 (21f777cd) · Commits · KIII-12 / Magento

Commit 21f777cd authored 8 years ago by

Dmytro Poperechnyy

Merge remote-tracking branch 'origin/develop' into MAGETWO-60155

# Conflicts:
#	app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php

parents 575b5f0f 76315a6c

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php 7 additions, 14 deletions

...dle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows-grid.js 59 additions, 0 deletions

...w/adminhtml/web/js/components/bundle-dynamic-rows-grid.js
app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows.js 98 additions, 0 deletions

...e/view/adminhtml/web/js/components/bundle-dynamic-rows.js
app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php 12 additions, 4 deletions

...g/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Decimal.php 2 additions, 1 deletion

...talog/Model/ResourceModel/Product/Indexer/Eav/Decimal.php
app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php 45 additions, 32 deletions

...atalog/Model/ResourceModel/Product/Indexer/Eav/Source.php
app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php 1 addition, 1 deletion

...odel/ResourceModel/Product/Indexer/Price/DefaultPrice.php
app/code/Magento/Catalog/Setup/InstallSchema.php 1 addition, 1 deletion

app/code/Magento/Catalog/Setup/InstallSchema.php
app/code/Magento/Catalog/Setup/UpgradeSchema.php 47 additions, 0 deletions

app/code/Magento/Catalog/Setup/UpgradeSchema.php
app/code/Magento/Catalog/etc/module.xml 1 addition, 1 deletion

app/code/Magento/Catalog/etc/module.xml
app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php 22 additions, 10 deletions

...ogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php
app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/AliasResolver.php 44 additions, 0 deletions

...atalogSearch/Model/Adapter/Mysql/Filter/AliasResolver.php
app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php 51 additions, 6 deletions

...CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
app/code/Magento/CatalogSearch/Model/Search/FilterMapper/ExclusionStrategy.php 83 additions, 0 deletions

...logSearch/Model/Search/FilterMapper/ExclusionStrategy.php
app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterContext.php 100 additions, 0 deletions

...CatalogSearch/Model/Search/FilterMapper/FilterContext.php
app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterStrategyInterface.php 23 additions, 0 deletions

...rch/Model/Search/FilterMapper/FilterStrategyInterface.php
app/code/Magento/CatalogSearch/Model/Search/FilterMapper/StaticAttributeStrategy.php 74 additions, 0 deletions

...rch/Model/Search/FilterMapper/StaticAttributeStrategy.php
app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy.php 127 additions, 0 deletions

...Search/Model/Search/FilterMapper/TermDropdownStrategy.php
app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php 2 additions, 1 deletion

app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
app/code/Magento/CatalogSearch/Model/Search/TableMapper.php 64 additions, 134 deletions

app/code/Magento/CatalogSearch/Model/Search/TableMapper.php

with 863 additions and 205 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'origin/develop' into MAGETWO-60155