There was an error fetching the commit references. Please try again later.
Merge remote-tracking branch 'origin/MAGETWO-42617' into BUGS
Showing
- app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/AbstractType.php 6 additions, 2 deletions.../Adminhtml/Product/Edit/Tab/Options/Type/AbstractType.php
- app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php 2 additions, 2 deletions.../Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php
- app/code/Magento/Catalog/Ui/Component/FilterFactory.php 9 additions, 5 deletionsapp/code/Magento/Catalog/Ui/Component/FilterFactory.php
- app/code/Magento/Catalog/Ui/Component/Listing/Attribute/AbstractRepository.php 47 additions, 0 deletions...log/Ui/Component/Listing/Attribute/AbstractRepository.php
- app/code/Magento/Catalog/Ui/Component/Listing/Attribute/Repository.php 17 additions, 0 deletions...nto/Catalog/Ui/Component/Listing/Attribute/Repository.php
- app/code/Magento/Catalog/Ui/Component/Listing/Attribute/RepositoryInterface.php 16 additions, 0 deletions...og/Ui/Component/Listing/Attribute/RepositoryInterface.php
- app/code/Magento/Catalog/Ui/Component/Listing/Columns.php 5 additions, 2 deletionsapp/code/Magento/Catalog/Ui/Component/Listing/Columns.php
- app/code/Magento/Catalog/Ui/Component/Listing/Filters.php 3 additions, 3 deletionsapp/code/Magento/Catalog/Ui/Component/Listing/Filters.php
- app/code/Magento/Catalog/etc/adminhtml/di.xml 1 addition, 0 deletionsapp/code/Magento/Catalog/etc/adminhtml/di.xml
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml 1 addition, 1 deletion...ew/adminhtml/templates/catalog/product/edit/options.phtml
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml 3 additions, 1 deletion...ml/templates/catalog/product/edit/options/type/date.phtml
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml 1 addition, 1 deletion...ml/templates/catalog/product/edit/options/type/file.phtml
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/select.phtml 3 additions, 1 deletion.../templates/catalog/product/edit/options/type/select.phtml
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/text.phtml 1 addition, 1 deletion...ml/templates/catalog/product/edit/options/type/text.phtml
- app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php 1 addition, 1 deletionapp/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
- app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php 1 addition, 2 deletions.../CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php
- app/code/Magento/CatalogRuleConfigurable/LICENSE.txt 48 additions, 0 deletionsapp/code/Magento/CatalogRuleConfigurable/LICENSE.txt
- app/code/Magento/CatalogRuleConfigurable/LICENSE_AFL.txt 48 additions, 0 deletionsapp/code/Magento/CatalogRuleConfigurable/LICENSE_AFL.txt
- app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/ConfigurableProductsProvider.php 37 additions, 0 deletions...Plugin/CatalogRule/Model/ConfigurableProductsProvider.php
- app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Indexer/ProductRuleReindex.php 93 additions, 0 deletions...e/Plugin/CatalogRule/Model/Indexer/ProductRuleReindex.php
Please register or sign in to comment