Merge branch 'develop' of https://github.com/magento/magento2ce into MAGETWO-55757
Showing
- Gruntfile.js.sample 7 additions, 2 deletionsGruntfile.js.sample
- app/code/Magento/Braintree/Gateway/Config/Config.php 10 additions, 0 deletionsapp/code/Magento/Braintree/Gateway/Config/Config.php
- app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php 1 addition, 1 deletion.../Magento/Braintree/Gateway/Request/PaymentDataBuilder.php
- app/code/Magento/Braintree/Model/Ui/ConfigProvider.php 9 additions, 1 deletionapp/code/Magento/Braintree/Model/Ui/ConfigProvider.php
- app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php 1 addition, 2 deletions...tree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
- app/code/Magento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php 25 additions, 2 deletions...gento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php
- 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/layout/catalog_product_view.xml 26 additions, 0 deletions...nto/Catalog/view/frontend/layout/catalog_product_view.xml
- 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/CatalogInventory/Setup/InstallSchema.php 1 addition, 1 deletionapp/code/Magento/CatalogInventory/Setup/InstallSchema.php
- app/code/Magento/CatalogInventory/etc/module.xml 1 addition, 1 deletionapp/code/Magento/CatalogInventory/etc/module.xml
- app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml 1 addition, 1 deletion...talogSearch/view/frontend/templates/advanced/result.phtml
- app/code/Magento/Checkout/view/frontend/web/js/region-updater.js 26 additions, 6 deletions...e/Magento/Checkout/view/frontend/web/js/region-updater.js
- app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js 5 additions, 3 deletions...de/Magento/Checkout/view/frontend/web/js/view/shipping.js
- app/code/Magento/Checkout/view/frontend/web/template/shipping.html 2 additions, 2 deletions...Magento/Checkout/view/frontend/web/template/shipping.html
- app/code/Magento/Cookie/view/frontend/templates/html/notices.phtml 8 additions, 3 deletions...Magento/Cookie/view/frontend/templates/html/notices.phtml
- app/code/Magento/Dhl/Model/Plugin/Rma/Block/Adminhtml/Rma/Edit/Tab/General/Shippingmethod.php 0 additions, 39 deletions...a/Block/Adminhtml/Rma/Edit/Tab/General/Shippingmethod.php
Please register or sign in to comment