Merge remote-tracking branch 'origin/develop' into MAGETWO-44091 (b64a694b) · Commits · KIII-12 / Magento

Commit b64a694b authored 9 years ago by

Olga Matviienko

Browse files

Merge remote-tracking branch 'origin/develop' into MAGETWO-44091

parents a13e2013 6d75339a

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Authorizenet/Model/Authorizenet.php 11 additions, 1 deletion

app/code/Magento/Authorizenet/Model/Authorizenet.php
app/code/Magento/Authorizenet/Model/Directpost.php 5 additions, 3 deletions

app/code/Magento/Authorizenet/Model/Directpost.php
app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php 231 additions, 6 deletions

...e/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php
app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml 5 additions, 5 deletions

...thorizenet/view/adminhtml/templates/directpost/info.phtml
app/code/Magento/Backend/Console/Command/AbstractCacheTypeManageCommand.php 17 additions, 0 deletions

...ackend/Console/Command/AbstractCacheTypeManageCommand.php
app/code/Magento/Backend/Console/Command/CacheCleanCommand.php 1 addition, 0 deletions

...ode/Magento/Backend/Console/Command/CacheCleanCommand.php
app/code/Magento/Backend/Console/Command/CacheFlushCommand.php 1 addition, 0 deletions

...ode/Magento/Backend/Console/Command/CacheFlushCommand.php
app/code/Magento/Backend/Test/Unit/Console/Command/AbstractCacheCommandTest.php 2 additions, 2 deletions

...nd/Test/Unit/Console/Command/AbstractCacheCommandTest.php
app/code/Magento/Backend/Test/Unit/Console/Command/AbstractCacheManageCommandTest.php 15 additions, 1 deletion

...t/Unit/Console/Command/AbstractCacheManageCommandTest.php
app/code/Magento/Backend/Test/Unit/Console/Command/CacheCleanCommandTest.php 5 additions, 3 deletions

...ckend/Test/Unit/Console/Command/CacheCleanCommandTest.php
app/code/Magento/Backend/Test/Unit/Console/Command/CacheDisableCommandTest.php 8 additions, 3 deletions

...end/Test/Unit/Console/Command/CacheDisableCommandTest.php
app/code/Magento/Backend/Test/Unit/Console/Command/CacheEnableCommandTest.php 10 additions, 4 deletions

...kend/Test/Unit/Console/Command/CacheEnableCommandTest.php
app/code/Magento/Backend/Test/Unit/Console/Command/CacheFlushCommandTest.php 5 additions, 3 deletions

...ckend/Test/Unit/Console/Command/CacheFlushCommandTest.php
app/code/Magento/Backend/Test/Unit/Console/Command/CacheStatusCommandTest.php 2 additions, 2 deletions

...kend/Test/Unit/Console/Command/CacheStatusCommandTest.php
app/code/Magento/Braintree/Model/PaymentMethod.php 2 additions, 20 deletions

app/code/Magento/Braintree/Model/PaymentMethod.php
app/code/Magento/Braintree/Test/Unit/Model/PaymentMethodTest.php 118 additions, 98 deletions

...e/Magento/Braintree/Test/Unit/Model/PaymentMethodTest.php
app/code/Magento/Braintree/view/adminhtml/templates/form.phtml 1 addition, 1 deletion

...ode/Magento/Braintree/view/adminhtml/templates/form.phtml
app/code/Magento/Braintree/view/frontend/layout/braintree_paypal_review.xml 1 addition, 1 deletion

...raintree/view/frontend/layout/braintree_paypal_review.xml
app/code/Magento/Braintree/view/frontend/templates/PayPal/shortcut.phtml 1 addition, 1 deletion

...o/Braintree/view/frontend/templates/PayPal/shortcut.phtml
app/code/Magento/Braintree/view/frontend/templates/creditcard/edit.phtml 1 addition, 1 deletion

...o/Braintree/view/frontend/templates/creditcard/edit.phtml

with 442 additions and 155 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'origin/develop' into MAGETWO-44091