Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into MAGETWO-48223 (2381d607) · Commits · KIII-12 / Magento

Commit 2381d607 authored 9 years ago by

Oleh Posyniak

Browse files

Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into MAGETWO-48223

parents c00880b8 f227f6ab

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Model/Category/DataProvider.php 2 additions, 0 deletions

app/code/Magento/Catalog/Model/Category/DataProvider.php
app/code/Magento/Catalog/view/adminhtml/web/js/components/url-key-handle-changes.js 20 additions, 19 deletions

...iew/adminhtml/web/js/components/url-key-handle-changes.js
app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Category/Tab/Attributes.php 5 additions, 6 deletions

...lugin/Catalog/Block/Adminhtml/Category/Tab/Attributes.php
app/code/Magento/CatalogUrlRewrite/Ui/DataProvider/Product/Form/Modifier/ProductUrlRewrite.php 6 additions, 4 deletions

.../DataProvider/Product/Form/Modifier/ProductUrlRewrite.php
app/code/Magento/CatalogUrlRewrite/view/adminhtml/ui_component/category_form.xml 4 additions, 1 deletion

...gUrlRewrite/view/adminhtml/ui_component/category_form.xml
app/code/Magento/CatalogUrlRewrite/view/adminhtml/web/js/components/url-key-handle-changes.js 0 additions, 59 deletions

...iew/adminhtml/web/js/components/url-key-handle-changes.js
app/code/Magento/Ui/view/base/web/js/form/components/button.js 3 additions, 2 deletions

...ode/Magento/Ui/view/base/web/js/form/components/button.js
app/code/Magento/Ui/view/base/web/js/form/components/insert-form.js 17 additions, 13 deletions

...agento/Ui/view/base/web/js/form/components/insert-form.js
app/code/Magento/Ui/view/base/web/js/form/components/insert.js 2 additions, 3 deletions

...ode/Magento/Ui/view/base/web/js/form/components/insert.js
app/code/Magento/Ui/view/base/web/js/form/element/date.js 1 addition, 3 deletions

app/code/Magento/Ui/view/base/web/js/form/element/date.js
app/code/Magento/Ui/view/base/web/js/grid/columns/date.js 2 additions, 2 deletions

app/code/Magento/Ui/view/base/web/js/grid/columns/date.js
app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/bind-html.js 74 additions, 0 deletions

...to/Ui/view/base/web/js/lib/knockout/bindings/bind-html.js
app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/bootstrap.js 2 additions, 0 deletions

...to/Ui/view/base/web/js/lib/knockout/bindings/bootstrap.js
app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/resizable.js 147 additions, 0 deletions

...to/Ui/view/base/web/js/lib/knockout/bindings/resizable.js
app/code/Magento/Ui/view/base/web/js/lib/knockout/extender/bound-nodes.js 26 additions, 3 deletions

.../Ui/view/base/web/js/lib/knockout/extender/bound-nodes.js
app/code/Magento/Ui/view/base/web/js/lib/registry/registry.js 1 addition, 0 deletions

...code/Magento/Ui/view/base/web/js/lib/registry/registry.js
app/code/Magento/Ui/view/base/web/js/modal/modal-component.js 3 additions, 2 deletions

...code/Magento/Ui/view/base/web/js/modal/modal-component.js
app/code/Magento/Ui/view/base/web/templates/form/element/split-button.html 19 additions, 0 deletions

...Ui/view/base/web/templates/form/element/split-button.html
app/code/Magento/Ui/view/base/web/templates/form/insert.html 1 addition, 1 deletion

app/code/Magento/Ui/view/base/web/templates/form/insert.html
app/design/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_scheduled-changes.less 19 additions, 36 deletions

...nto_Staging/web/css/source/module/_scheduled-changes.less

with 354 additions and 154 deletions

Please register or to comment

Admin message

Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into MAGETWO-48223