Merge branch 'develop' of github.com:magento/magento2ce into troll_bugfix
Showing
- .gitignore 2 additions, 0 deletions.gitignore
- 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/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
- app/code/Magento/Braintree/view/adminhtml/templates/form/vault.phtml 2 additions, 1 deletion...gento/Braintree/view/adminhtml/templates/form/vault.phtml
- app/code/Magento/Braintree/view/adminhtml/web/js/vault.js 22 additions, 12 deletionsapp/code/Magento/Braintree/view/adminhtml/web/js/vault.js
- app/code/Magento/Checkout/view/frontend/web/js/model/payment/method-group.js 31 additions, 0 deletions...eckout/view/frontend/web/js/model/payment/method-group.js
- app/code/Magento/Checkout/view/frontend/web/js/view/payment/list.js 113 additions, 28 deletions...agento/Checkout/view/frontend/web/js/view/payment/list.js
- app/code/Magento/Checkout/view/frontend/web/template/payment-methods/list.html 15 additions, 5 deletions...kout/view/frontend/web/template/payment-methods/list.html
- app/code/Magento/Checkout/view/frontend/web/template/payment.html 0 additions, 1 deletion.../Magento/Checkout/view/frontend/web/template/payment.html
- app/code/Magento/Paypal/Model/Payflow/Transparent.php 1 addition, 0 deletionsapp/code/Magento/Paypal/Model/Payflow/Transparent.php
- app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php 7 additions, 0 deletions...agento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php
- app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js 1 addition, 3 deletions...ode/Magento/Ui/view/base/web/js/form/element/ui-select.js
- app/code/Magento/Ui/view/base/web/js/lib/core/collection.js 8 additions, 0 deletionsapp/code/Magento/Ui/view/base/web/js/lib/core/collection.js
Please register or sign in to comment