Merge branch 'develop' into FearlessKiwis-MAGETWO-54785-State-province-not-required-mainline
Showing
- app/code/Magento/Catalog/i18n/en_US.csv 1 addition, 0 deletionsapp/code/Magento/Catalog/i18n/en_US.csv
- app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml 6 additions, 3 deletions...atalog/view/adminhtml/ui_component/design_config_form.xml
- app/code/Magento/Catalog/view/adminhtml/web/component/image-size-field.js 42 additions, 0 deletions.../Catalog/view/adminhtml/web/component/image-size-field.js
- app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml 1 addition, 1 deletion...o/Catalog/view/frontend/templates/product/view/form.phtml
- app/code/Magento/CatalogImportExport/Model/Export/Product.php 8 additions, 0 deletions...code/Magento/CatalogImportExport/Model/Export/Product.php
- app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php 23 additions, 0 deletions...gento/CatalogImportExport/Model/Import/Product/Option.php
- app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml 2 additions, 1 deletion...atches/view/adminhtml/ui_component/design_config_form.xml
- app/code/Magento/Ui/view/base/web/js/grid/filters/range.js 5 additions, 4 deletionsapp/code/Magento/Ui/view/base/web/js/grid/filters/range.js
- composer.lock 59 additions, 59 deletionscomposer.lock
- dev/tests/functional/composer.json 1 addition, 1 deletiondev/tests/functional/composer.json
- dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/ExpireAdminSessionTest.php 0 additions, 1 deletion.../Magento/Backend/Test/TestCase/ExpireAdminSessionTest.php
- dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/GlobalSearchEntityTest.php 1 addition, 2 deletions.../Magento/Backend/Test/TestCase/GlobalSearchEntityTest.php
- dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/HttpsHeadersDisableTest.php 0 additions, 1 deletion...Magento/Backend/Test/TestCase/HttpsHeadersDisableTest.php
- dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/HttpsHeadersEnableTest.php 0 additions, 1 deletion.../Magento/Backend/Test/TestCase/HttpsHeadersEnableTest.php
- dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/NavigateMenuTest.php 0 additions, 1 deletion...ts/app/Magento/Backend/Test/TestCase/NavigateMenuTest.php
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.php 1 addition, 2 deletions...Braintree/Test/TestCase/BraintreeSettlementReportTest.php
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.php 1 addition, 2 deletions...ree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.php
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.php 1 addition, 2 deletions...Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.php
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.php 1 addition, 2 deletions...st/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.php
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePayPalBraintreeTest.php 1 addition, 2 deletions...to/Braintree/Test/TestCase/InvoicePayPalBraintreeTest.php
Please register or sign in to comment