Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into MAGETWO-42984-3 (d01f1cc5) · Commits · KIII-12 / Magento

Commit d01f1cc5 authored 9 years ago by

Oleh Posyniak

Browse files

Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into MAGETWO-42984-3

parents 240e2576 80c5e2b0

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/Block/Widget/Button/Item.php 6 additions, 6 deletions

app/code/Magento/Backend/Block/Widget/Button/Item.php
app/code/Magento/Backend/Block/Widget/Button/Toolbar/Container.php 2 additions, 2 deletions

...Magento/Backend/Block/Widget/Button/Toolbar/Container.php
app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php 7 additions, 4 deletions

...to/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
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/Backend/i18n/de_DE.csv 8 additions, 0 deletions

app/code/Magento/Backend/i18n/de_DE.csv
app/code/Magento/Backend/i18n/en_US.csv 8 additions, 0 deletions

app/code/Magento/Backend/i18n/en_US.csv
app/code/Magento/Backend/i18n/es_ES.csv 8 additions, 0 deletions

app/code/Magento/Backend/i18n/es_ES.csv

with 357 additions and 45 deletions

Please register or to comment

Admin message

Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into MAGETWO-42984-3