Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into bugfixes
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- .htaccess 75 additions, 5 deletions.htaccess
- .htaccess.sample 79 additions, 16 deletions.htaccess.sample
- app/code/Magento/Backend/Block/Widget/Grid.php 1 addition, 1 deletionapp/code/Magento/Backend/Block/Widget/Grid.php
- app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/AbstractFilter.php 3 additions, 3 deletions...ackend/Block/Widget/Grid/Column/Filter/AbstractFilter.php
- app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/TextTest.php 68 additions, 0 deletions...nd/Test/Unit/Block/Widget/Grid/Column/Filter/TextTest.php
- app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml 10 additions, 10 deletions...agento/Backend/view/adminhtml/templates/widget/grid.phtml
- app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml 11 additions, 11 deletions...ckend/view/adminhtml/templates/widget/grid/extended.phtml
- app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Selection/Grid.php 6 additions, 3 deletions...nto/Bundle/Controller/Adminhtml/Bundle/Selection/Grid.php
- app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Bundle/Selection/GridTest.php 11 additions, 0 deletions...t/Unit/Controller/Adminhtml/Bundle/Selection/GridTest.php
- app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml 1 addition, 1 deletion.../templates/catalog/product/view/type/bundle/options.phtml
- app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php 4 additions, 3 deletions...to/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php
- app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php 4 additions, 4 deletions...ode/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
- app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php 1 addition, 1 deletion...agento/Catalog/Block/Product/View/Options/Type/Select.php
- app/code/Magento/Catalog/Model/Product.php 3 additions, 0 deletionsapp/code/Magento/Catalog/Model/Product.php
- app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php 15 additions, 0 deletionsapp/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
- app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_new.xml 6 additions, 0 deletions...nto/Catalog/view/adminhtml/layout/catalog_product_new.xml
- app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml 1 addition, 1 deletion...w/adminhtml/templates/product/edit/attribute/search.phtml
- app/code/Magento/CatalogInventory/Model/Resource/QtyCounterInterface.php 22 additions, 0 deletions...o/CatalogInventory/Model/Resource/QtyCounterInterface.php
- app/code/Magento/CatalogInventory/Model/Resource/Stock.php 3 additions, 10 deletionsapp/code/Magento/CatalogInventory/Model/Resource/Stock.php
Please register or sign in to comment