Merge remote-tracking branch 'mainline/develop' into MAGETWO-36033 (2686f8ec) · Commits · KIII-12 / Magento

There was an error fetching the commit references. Please try again later.

Commit 2686f8ec authored 10 years ago by

Sergey Semenov

Browse files

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

parents 6626381e d4f4da9b

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php 2 additions, 2 deletions

...Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php
app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Range.php 2 additions, 2 deletions

...Magento/Backend/Block/Widget/Grid/Column/Filter/Range.php
app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Select.php 1 addition, 1 deletion

...agento/Backend/Block/Widget/Grid/Column/Filter/Select.php
app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Text.php 1 addition, 1 deletion

.../Magento/Backend/Block/Widget/Grid/Column/Filter/Text.php
app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php 1 addition, 1 deletion

...Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php 3 additions, 0 deletions

...to/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml 1 addition, 1 deletion

...nto/Backend/view/adminhtml/templates/dashboard/grid.phtml
app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml 2 additions, 0 deletions

...agento/Backend/view/adminhtml/templates/widget/form.phtml
app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml 4 additions, 4 deletions

...w/adminhtml/templates/widget/form/renderer/fieldset.phtml
app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml 5 additions, 5 deletions

...tml/templates/widget/form/renderer/fieldset/element.phtml
app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml 4 additions, 4 deletions

...agento/Backend/view/adminhtml/templates/widget/grid.phtml
app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml 6 additions, 5 deletions

...ckend/view/adminhtml/templates/widget/grid/extended.phtml
app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml 7 additions, 9 deletions

...templates/product/composite/fieldset/options/bundle.phtml
app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml 47 additions, 37 deletions

...es/product/composite/fieldset/options/type/checkbox.phtml
app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml 4 additions, 4 deletions

...lates/product/composite/fieldset/options/type/multi.phtml
app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml 15 additions, 12 deletions

...lates/product/composite/fieldset/options/type/radio.phtml
app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml 8 additions, 8 deletions

...ates/product/composite/fieldset/options/type/select.phtml
app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php 1 addition, 1 deletion

.../Magento/Catalog/Block/Product/View/Options/Type/Date.php
app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php 11 additions, 8 deletions

...agento/Catalog/Block/Product/View/Options/Type/Select.php
app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options.phtml 4 additions, 2 deletions

...emplates/catalog/product/composite/fieldset/options.phtml

with 129 additions and 107 deletions

Please register or to comment

Admin message

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