Merge remote-tracking branch 'mainline/develop' into develop
Showing
- app/code/Magento/Backend/Block/Widget/Form.php 1 addition, 1 deletionapp/code/Magento/Backend/Block/Widget/Form.php
- app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php 120 additions, 122 deletions...est/Unit/Controller/Adminhtml/System/Account/SaveTest.php
- app/code/Magento/Backend/i18n/en_US.csv 6 additions, 0 deletionsapp/code/Magento/Backend/i18n/en_US.csv
- app/code/Magento/Catalog/i18n/en_US.csv 21 additions, 0 deletionsapp/code/Magento/Catalog/i18n/en_US.csv
- app/code/Magento/CatalogRule/Model/Rule.php 4 additions, 0 deletionsapp/code/Magento/CatalogRule/Model/Rule.php
- app/code/Magento/Deploy/Model/Deployer.php 4 additions, 5 deletionsapp/code/Magento/Deploy/Model/Deployer.php
- app/code/Magento/Developer/i18n/en_US.csv 40 additions, 0 deletionsapp/code/Magento/Developer/i18n/en_US.csv
- app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php 11 additions, 1 deletion.../Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
- app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php 41 additions, 7 deletions...est/Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php
- app/code/Magento/Email/Block/Adminhtml/Template/Preview.php 10 additions, 11 deletionsapp/code/Magento/Email/Block/Adminhtml/Template/Preview.php
- app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php 2 additions, 1 deletion...nto/Email/Controller/Adminhtml/Email/Template/Preview.php
- app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/PreviewTest.php 23 additions, 25 deletions.../Email/Test/Unit/Block/Adminhtml/Template/PreviewTest.php
- app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/PreviewTest.php 115 additions, 0 deletions.../Unit/Controller/Adminhtml/Email/Template/PreviewTest.php
- app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_preview.xml 16 additions, 0 deletions...iew/adminhtml/layout/adminhtml_email_template_preview.xml
- app/code/Magento/Email/view/adminhtml/layout/systemPreview.xml 0 additions, 14 deletions...ode/Magento/Email/view/adminhtml/layout/systemPreview.xml
- app/code/Magento/Email/view/adminhtml/templates/template/preview.phtml 2 additions, 0 deletions...nto/Email/view/adminhtml/templates/template/preview.phtml
- app/code/Magento/Marketplace/i18n/en_US.csv 12 additions, 0 deletionsapp/code/Magento/Marketplace/i18n/en_US.csv
- app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml 23 additions, 25 deletions.../Magento/Marketplace/view/adminhtml/templates/index.phtml
- app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml 3 additions, 3 deletions...gento/Marketplace/view/adminhtml/templates/partners.phtml
- app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml 18 additions, 0 deletions...ishipping/view/frontend/layout/multishipping_checkout.xml
Please register or sign in to comment