Merge branch 'MAGETWO-39157' into MAGETWO-37206 (d6946eb0) · Commits · KIII-12 / Magento

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

Commit d6946eb0 authored 9 years ago by

Volodymyr Kholoshenko

Browse files

Merge branch 'MAGETWO-39157' into MAGETWO-37206

parents 02e38fc6 d60798ed

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php 1 addition, 1 deletion

.../Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
app/code/Magento/Catalog/view/adminhtml/web/js/new-category-dialog.js 1 addition, 1 deletion

...ento/Catalog/view/adminhtml/web/js/new-category-dialog.js
app/code/Magento/CatalogRule/Helper/Data.php 1 addition, 2 deletions

app/code/Magento/CatalogRule/Helper/Data.php
app/code/Magento/CatalogRule/Test/Unit/Helper/DataTest.php 68 additions, 0 deletions

app/code/Magento/CatalogRule/Test/Unit/Helper/DataTest.php
app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php 47 additions, 19 deletions

...Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php
app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php 36 additions, 3 deletions

.../Magento/Cms/Ui/Component/Listing/Column/BlockActions.php
app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php 16 additions, 14 deletions

...e/Magento/Cms/Ui/Component/Listing/Column/PageActions.php
app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml 20 additions, 6 deletions

...nto/Cms/view/adminhtml/ui_component/cms_block_listing.xml
app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml 24 additions, 9 deletions

...ento/Cms/view/adminhtml/ui_component/cms_page_listing.xml
app/code/Magento/Customer/view/base/ui_component/customer_form.xml 0 additions, 13 deletions

...Magento/Customer/view/base/ui_component/customer_form.xml
app/code/Magento/GroupedProduct/view/adminhtml/web/js/grouped-product.js 8 additions, 30 deletions

...o/GroupedProduct/view/adminhtml/web/js/grouped-product.js
app/code/Magento/Sales/view/adminhtml/web/order/edit/message.js 19 additions, 6 deletions

...de/Magento/Sales/view/adminhtml/web/order/edit/message.js
app/code/Magento/Ui/Component/Bookmark.php 6 additions, 1 deletion

app/code/Magento/Ui/Component/Bookmark.php
app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php 49 additions, 23 deletions

app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php
app/code/Magento/Ui/view/base/web/js/core/renderer/layout.js 4 additions, 0 deletions

app/code/Magento/Ui/view/base/web/js/core/renderer/layout.js
app/code/Magento/Ui/view/base/web/js/form/element/abstract.js 2 additions, 3 deletions

...code/Magento/Ui/view/base/web/js/form/element/abstract.js
app/code/Magento/Ui/view/base/web/js/form/element/boolean.js 1 addition, 1 deletion

app/code/Magento/Ui/view/base/web/js/form/element/boolean.js
app/code/Magento/Ui/view/base/web/js/form/element/date.js 1 addition, 1 deletion

app/code/Magento/Ui/view/base/web/js/form/element/date.js
app/code/Magento/Ui/view/base/web/js/form/element/multiselect.js 1 addition, 1 deletion

...e/Magento/Ui/view/base/web/js/form/element/multiselect.js
app/code/Magento/Ui/view/base/web/js/form/element/select.js 5 additions, 4 deletions

app/code/Magento/Ui/view/base/web/js/form/element/select.js

with 310 additions and 138 deletions

Please register or to comment

Admin message

Merge branch 'MAGETWO-39157' into MAGETWO-37206