Merge remote-tracking branch 'mainline/develop' into develop (37f18dae) · Commits · KIII-12 / Magento

Commit 37f18dae authored 10 years ago by

Dale Sikkema

Browse files

Merge remote-tracking branch 'mainline/develop' into develop

parents a63d64bb 980f6582

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/Block/Widget/Grid.php 1 addition, 1 deletion

app/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/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/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/Block/Adminhtml/Product/Edit/Tabs.php 4 additions, 4 deletions

...ode/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
app/code/Magento/Catalog/Model/Product.php 3 additions, 0 deletions

app/code/Magento/Catalog/Model/Product.php
app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php 15 additions, 0 deletions

app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
app/code/Magento/Catalog/Ui/Component/FilterFactory.php 9 additions, 5 deletions

app/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 deletions

app/code/Magento/Catalog/Ui/Component/Listing/Columns.php
app/code/Magento/Catalog/Ui/Component/Listing/Filters.php 3 additions, 3 deletions

app/code/Magento/Catalog/Ui/Component/Listing/Filters.php
app/code/Magento/Catalog/etc/adminhtml/di.xml 1 addition, 0 deletions

app/code/Magento/Catalog/etc/adminhtml/di.xml

with 242 additions and 49 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'mainline/develop' into develop