Merge remote-tracking branch 'mainline/develop' into BUGS_PR (a89cb3a0) · Commits · KIII-12 / Magento

Commit a89cb3a0 authored 9 years ago by

Yaroslav Onischenko

Browse files

Merge remote-tracking branch 'mainline/develop' into BUGS_PR

parents eea5a8fd 798a8420

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Braintree/Block/Adminhtml/Form/Field/CcTypes.php 2 additions, 2 deletions

.../Magento/Braintree/Block/Adminhtml/Form/Field/CcTypes.php
app/code/Magento/Braintree/Block/Adminhtml/Form/Field/Cctypes.php 0 additions, 80 deletions

.../Magento/Braintree/Block/Adminhtml/Form/Field/Cctypes.php
app/code/Magento/Braintree/Block/Adminhtml/Form/Field/Countries.php 17 additions, 49 deletions

...agento/Braintree/Block/Adminhtml/Form/Field/Countries.php
app/code/Magento/Braintree/Block/Adminhtml/Form/Field/CountryCreditCard.php 1 addition, 1 deletion

...raintree/Block/Adminhtml/Form/Field/CountryCreditCard.php
app/code/Magento/Braintree/Block/Adminhtml/Form/Field/Countrycreditcard.php 0 additions, 104 deletions

...raintree/Block/Adminhtml/Form/Field/Countrycreditcard.php
app/code/Magento/Braintree/Block/Checkout/Review.php 0 additions, 33 deletions

app/code/Magento/Braintree/Block/Checkout/Review.php
app/code/Magento/Braintree/Block/Creditcard/Management.php 0 additions, 427 deletions

app/code/Magento/Braintree/Block/Creditcard/Management.php
app/code/Magento/Braintree/Block/Customer/CardRenderer.php 2 additions, 2 deletions

app/code/Magento/Braintree/Block/Customer/CardRenderer.php
app/code/Magento/Braintree/Block/Datajs.php 0 additions, 68 deletions

app/code/Magento/Braintree/Block/Datajs.php
app/code/Magento/Braintree/Block/Directory/Data.php 0 additions, 137 deletions

app/code/Magento/Braintree/Block/Directory/Data.php
app/code/Magento/Braintree/Block/Form.php 64 additions, 198 deletions

app/code/Magento/Braintree/Block/Form.php
app/code/Magento/Braintree/Block/Info.php 12 additions, 89 deletions

app/code/Magento/Braintree/Block/Info.php
app/code/Magento/Braintree/Block/Info/PayPal.php 0 additions, 81 deletions

app/code/Magento/Braintree/Block/Info/PayPal.php
app/code/Magento/Braintree/Block/PayPal/Shortcut.php 0 additions, 242 deletions

app/code/Magento/Braintree/Block/PayPal/Shortcut.php
app/code/Magento/Braintree/Block/Payment.php 3 additions, 2 deletions

app/code/Magento/Braintree/Block/Payment.php
app/code/Magento/Braintree/Block/Paypal/Button.php 3 additions, 3 deletions

app/code/Magento/Braintree/Block/Paypal/Button.php
app/code/Magento/Braintree/Block/Paypal/Checkout/Review.php 2 additions, 2 deletions

app/code/Magento/Braintree/Block/Paypal/Checkout/Review.php
app/code/Magento/Braintree/Controller/Adminhtml/Payment/GetNonce.php 2 additions, 2 deletions

...gento/Braintree/Controller/Adminhtml/Payment/GetNonce.php
app/code/Magento/Braintree/Controller/Adminhtml/Report/Index.php 2 additions, 2 deletions

...e/Magento/Braintree/Controller/Adminhtml/Report/Index.php
app/code/Magento/Braintree/Controller/Creditcard/AjaxSave.php 0 additions, 49 deletions

...code/Magento/Braintree/Controller/Creditcard/AjaxSave.php

with 110 additions and 1573 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'mainline/develop' into BUGS_PR