Merge remote-tracking branch 'origin/develop' into MAGETWO-44091
Showing
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml 1 addition, 1 deletion...alog/view/adminhtml/templates/catalog/category/tree.phtml
- app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js 1 addition, 4 deletions...view/adminhtml/web/catalog/product/composite/configure.js
- app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml 9 additions, 0 deletions...uct/configurable/affected-attribute-set-selector/js.phtml
- app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/validator.js 22 additions, 1 deletion...frontend/web/js/model/credit-card-validation/validator.js
- app/code/Magento/Payment/view/frontend/web/template/payment/cc-form.html 1 addition, 1 deletion...o/Payment/view/frontend/web/template/payment/cc-form.html
- app/code/Magento/ProductVideo/view/adminhtml/web/js/video-modal.js 39 additions, 41 deletions...Magento/ProductVideo/view/adminhtml/web/js/video-modal.js
- app/code/Magento/ProductVideo/view/frontend/layout/catalog_product_view.xml 0 additions, 4 deletions...roductVideo/view/frontend/layout/catalog_product_view.xml
- app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js 15 additions, 14 deletions.../Magento/Sales/view/adminhtml/web/order/create/scripts.js
- app/code/Magento/Ui/view/base/web/js/grid/sticky/sticky.js 7 additions, 6 deletionsapp/code/Magento/Ui/view/base/web/js/grid/sticky/sticky.js
- app/code/Magento/Ui/view/base/web/js/lib/core/storage.js 64 additions, 0 deletionsapp/code/Magento/Ui/view/base/web/js/lib/core/storage.js
- app/code/Magento/Ui/view/base/web/js/modal/modal.js 1 addition, 1 deletionapp/code/Magento/Ui/view/base/web/js/modal/modal.js
- dev/tests/static/testsuite/Magento/Test/Js/_files/jscs/.jscsrc 1 addition, 0 deletions...ests/static/testsuite/Magento/Test/Js/_files/jscs/.jscsrc
- lib/web/fotorama/fotorama.min.js 5 additions, 0 deletionslib/web/fotorama/fotorama.min.js
- lib/web/mage/validation/url.js 3 additions, 1 deletionlib/web/mage/validation/url.js
Please register or sign in to comment