Merge remote-tracking branch 'upstream/develop' into MAGETWO-58261-customer-change-password
Showing
- app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml 38 additions, 12 deletions...thorizenet/view/adminhtml/templates/directpost/info.phtml
- app/code/Magento/Backend/Block/Widget/Form/Container.php 16 additions, 0 deletionsapp/code/Magento/Backend/Block/Widget/Form/Container.php
- app/code/Magento/Backend/etc/adminhtml/system.xml 1 addition, 1 deletionapp/code/Magento/Backend/etc/adminhtml/system.xml
- app/code/Magento/Braintree/Helper/Country.php 7 additions, 8 deletionsapp/code/Magento/Braintree/Helper/Country.php
- app/code/Magento/Braintree/etc/adminhtml/system.xml 2 additions, 2 deletionsapp/code/Magento/Braintree/etc/adminhtml/system.xml
- app/code/Magento/Braintree/etc/di.xml 18 additions, 1 deletionapp/code/Magento/Braintree/etc/di.xml
- app/code/Magento/Braintree/view/adminhtml/web/styles.css 2 additions, 2 deletionsapp/code/Magento/Braintree/view/adminhtml/web/styles.css
- app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js 16 additions, 3 deletions...ew/frontend/web/js/view/payment/method-renderer/paypal.js
- app/code/Magento/Braintree/view/frontend/web/template/payment/form.html 2 additions, 2 deletions...to/Braintree/view/frontend/web/template/payment/form.html
- app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html 2 additions, 2 deletions.../Braintree/view/frontend/web/template/payment/paypal.html
- app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php 31 additions, 13 deletions...Magento/BundleImportExport/Model/Export/RowCustomizer.php
- app/code/Magento/BundleImportExport/Test/Unit/Model/Export/Product/RowCustomizerTest.php 3 additions, 2 deletions...port/Test/Unit/Model/Export/Product/RowCustomizerTest.php
- app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php 35 additions, 10 deletions...to/CacheInvalidate/Observer/InvalidateVarnishObserver.php
- app/code/Magento/CacheInvalidate/Test/Unit/Observer/InvalidateVarnishObserverTest.php 14 additions, 1 deletion...date/Test/Unit/Observer/InvalidateVarnishObserverTest.php
- app/code/Magento/Catalog/Console/Command/ProductAttributesCleanUp.php 3 additions, 0 deletions...ento/Catalog/Console/Command/ProductAttributesCleanUp.php
- app/code/Magento/Catalog/Controller/Adminhtml/Category.php 13 additions, 1 deletionapp/code/Magento/Catalog/Controller/Adminhtml/Category.php
- app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php 2 additions, 1 deletion...de/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
- app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php 1 addition, 1 deletion...de/Magento/Catalog/Controller/Adminhtml/Category/Move.php
- app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php 12 additions, 5 deletions...og/Controller/Adminhtml/Product/Initialization/Helper.php
- app/code/Magento/Catalog/Helper/Product/Compare.php 7 additions, 5 deletionsapp/code/Magento/Catalog/Helper/Product/Compare.php
Please register or sign in to comment