Merge remote-tracking branch 'origin/develop' into MAGETWO-59003
Showing
- .gitignore 2 additions, 0 deletions.gitignore
- app/bootstrap.php 14 additions, 3 deletionsapp/bootstrap.php
- app/code/Magento/AdminNotification/composer.json 1 addition, 1 deletionapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/AdvancedPricingImportExport/composer.json 1 addition, 1 deletionapp/code/Magento/AdvancedPricingImportExport/composer.json
- app/code/Magento/Authorization/composer.json 1 addition, 1 deletionapp/code/Magento/Authorization/composer.json
- app/code/Magento/Authorizenet/composer.json 1 addition, 1 deletionapp/code/Magento/Authorizenet/composer.json
- app/code/Magento/Authorizenet/i18n/en_US.csv 1 addition, 0 deletionsapp/code/Magento/Authorizenet/i18n/en_US.csv
- app/code/Magento/Authorizenet/view/frontend/web/js/view/payment/method-renderer/authorizenet-directpost.js 4 additions, 3 deletions...s/view/payment/method-renderer/authorizenet-directpost.js
- app/code/Magento/Backend/composer.json 1 addition, 1 deletionapp/code/Magento/Backend/composer.json
- app/code/Magento/Backup/composer.json 1 addition, 1 deletionapp/code/Magento/Backup/composer.json
- app/code/Magento/Braintree/Model/Ui/Adminhtml/PayPal/TokenUiComponentProvider.php 84 additions, 0 deletions...ee/Model/Ui/Adminhtml/PayPal/TokenUiComponentProvider.php
- app/code/Magento/Braintree/Model/Ui/Adminhtml/TokenUiComponentProvider.php 1 addition, 0 deletions...Braintree/Model/Ui/Adminhtml/TokenUiComponentProvider.php
- app/code/Magento/Braintree/Test/Unit/Model/Ui/Adminhtml/PayPal/TokenUiComponentProviderTest.php 114 additions, 0 deletions...odel/Ui/Adminhtml/PayPal/TokenUiComponentProviderTest.php
- app/code/Magento/Braintree/Test/Unit/Model/Ui/Adminhtml/TokenUiComponentProviderTest.php 4 additions, 3 deletions.../Unit/Model/Ui/Adminhtml/TokenUiComponentProviderTest.php
- app/code/Magento/Braintree/composer.json 1 addition, 1 deletionapp/code/Magento/Braintree/composer.json
- app/code/Magento/Braintree/etc/adminhtml/di.xml 1 addition, 0 deletionsapp/code/Magento/Braintree/etc/adminhtml/di.xml
- app/code/Magento/Braintree/etc/config.xml 2 additions, 1 deletionapp/code/Magento/Braintree/etc/config.xml
- app/code/Magento/Braintree/view/adminhtml/layout/sales_order_create_index.xml 4 additions, 0 deletions...intree/view/adminhtml/layout/sales_order_create_index.xml
- app/code/Magento/Braintree/view/adminhtml/layout/sales_order_create_load_block_billing_method.xml 4 additions, 0 deletions...l/layout/sales_order_create_load_block_billing_method.xml
- app/code/Magento/Braintree/view/adminhtml/templates/form/paypal/vault.phtml 30 additions, 0 deletions...raintree/view/adminhtml/templates/form/paypal/vault.phtml
Please register or sign in to comment