There was an error fetching the commit references. Please try again later.
Merge remote-tracking branch 'upstream/develop' into MAGETWO-46577-functional-test-https
Showing
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml 1 addition, 1 deletion...dminhtml/templates/catalog/category/checkboxes/tree.phtml
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml 1 addition, 1 deletion...ew/adminhtml/templates/catalog/category/widget/tree.phtml
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml 1 addition, 1 deletion...inhtml/templates/catalog/product/attribute/set/main.phtml
- app/code/Magento/CatalogInventory/Helper/Stock.php 3 additions, 3 deletionsapp/code/Magento/CatalogInventory/Helper/Stock.php
- app/code/Magento/CatalogInventory/Observer/AddInventoryDataObserver.php 1 addition, 4 deletions...to/CatalogInventory/Observer/AddInventoryDataObserver.php
- app/code/Magento/CatalogInventory/Test/Unit/Observer/AddInventoryDataObserverTest.php 1 addition, 8 deletions...ntory/Test/Unit/Observer/AddInventoryDataObserverTest.php
- app/code/Magento/Downloadable/view/adminhtml/web/downloadable-type-handler.js 4 additions, 1 deletion...nloadable/view/adminhtml/web/downloadable-type-handler.js
- app/code/Magento/Ui/view/base/web/js/form/components/button.js 103 additions, 0 deletions...ode/Magento/Ui/view/base/web/js/form/components/button.js
- app/code/Magento/Ui/view/base/web/js/lib/core/element/links.js 6 additions, 1 deletion...ode/Magento/Ui/view/base/web/js/lib/core/element/links.js
- app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/outer_click.js 25 additions, 1 deletion.../Ui/view/base/web/js/lib/knockout/bindings/outer_click.js
- app/code/Magento/Ui/view/base/web/js/modal/modal-component.js 315 additions, 0 deletions...code/Magento/Ui/view/base/web/js/modal/modal-component.js
- app/code/Magento/Ui/view/base/web/js/modal/modal.js 5 additions, 3 deletionsapp/code/Magento/Ui/view/base/web/js/modal/modal.js
- app/code/Magento/Ui/view/base/web/templates/form/components/button/simple.html 7 additions, 0 deletions...iew/base/web/templates/form/components/button/simple.html
- app/code/Magento/Ui/view/base/web/templates/form/element/button.html 14 additions, 0 deletions...gento/Ui/view/base/web/templates/form/element/button.html
- app/code/Magento/Ui/view/base/web/templates/modal/modal-component.html 12 additions, 0 deletions...nto/Ui/view/base/web/templates/modal/modal-component.html
- app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml 2 additions, 2 deletions...ento/UrlRewrite/view/adminhtml/templates/categories.phtml
- app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml 1 addition, 1 deletion...ew/adminhtml/templates/catalog/category/widget/tree.phtml
- app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml 1 addition, 1 deletion...idget/view/adminhtml/templates/instance/edit/layout.phtml
Please register or sign in to comment