Merge remote-tracking branch 'main-ce/develop' into MAGETWO-52844-2.1
Showing
- app/code/Magento/PageCache/view/frontend/web/js/page-cache.js 1 addition, 1 deletion...code/Magento/PageCache/view/frontend/web/js/page-cache.js
- app/code/Magento/Sales/Model/Order.php 6 additions, 4 deletionsapp/code/Magento/Sales/Model/Order.php
- app/code/Magento/Sales/Setup/InstallSchema.php 0 additions, 9 deletionsapp/code/Magento/Sales/Setup/InstallSchema.php
- app/code/Magento/Sales/Setup/UpgradeSchema.php 40 additions, 1 deletionapp/code/Magento/Sales/Setup/UpgradeSchema.php
- app/code/Magento/Sales/Test/Unit/Model/OrderTest.php 110 additions, 0 deletionsapp/code/Magento/Sales/Test/Unit/Model/OrderTest.php
- app/code/Magento/Sales/etc/module.xml 1 addition, 1 deletionapp/code/Magento/Sales/etc/module.xml
- app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml 1 addition, 1 deletion...o/Sales/view/adminhtml/templates/order/address/form.phtml
- app/code/Magento/Sales/view/adminhtml/web/order/edit/address/form.js 34 additions, 0 deletions...gento/Sales/view/adminhtml/web/order/edit/address/form.js
- app/code/Magento/SalesRule/view/adminhtml/ui_component/sales_rule_form.xml 1 addition, 1 deletion...SalesRule/view/adminhtml/ui_component/sales_rule_form.xml
- app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js 32 additions, 1 deletionapp/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
- app/code/Magento/Ui/view/base/web/js/grid/resize.js 2 additions, 3 deletionsapp/code/Magento/Ui/view/base/web/js/grid/resize.js
- lib/web/mage/apply/scripts.js 1 addition, 1 deletionlib/web/mage/apply/scripts.js
- lib/web/mage/menu.js 6 additions, 5 deletionslib/web/mage/menu.js
Please register or sign in to comment