Merge pull request #384 from magento-ogre/PR_Branch (140595df) · Commits · KIII-12 / Magento

Commit 140595df authored 9 years ago by

Chellathurai, Mazhalai(mchellathura)

Merge pull request #384 from magento-ogre/PR_Branch

[Ogres] Bug-fixes

parents 434fbd01 c753cd74

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/etc/config.xml 1 addition, 0 deletions

app/code/Magento/Catalog/etc/config.xml
app/code/Magento/Customer/view/frontend/web/js/customer-data.js 2 additions, 1 deletion

...de/Magento/Customer/view/frontend/web/js/customer-data.js
app/code/Magento/MediaStorage/App/Media.php 56 additions, 70 deletions

app/code/Magento/MediaStorage/App/Media.php
app/code/Magento/MediaStorage/Model/File/Storage/Config.php 3 additions, 3 deletions

app/code/Magento/MediaStorage/Model/File/Storage/Config.php
app/code/Magento/MediaStorage/Model/File/Storage/Database/AbstractDatabase.php 22 additions, 7 deletions

...aStorage/Model/File/Storage/Database/AbstractDatabase.php
app/code/Magento/MediaStorage/Model/File/Storage/Request.php 4 additions, 26 deletions

app/code/Magento/MediaStorage/Model/File/Storage/Request.php
app/code/Magento/MediaStorage/Model/File/Storage/Synchronization.php 6 additions, 8 deletions

...gento/MediaStorage/Model/File/Storage/Synchronization.php
app/code/Magento/MediaStorage/Test/Unit/App/MediaTest.php 147 additions, 157 deletions

app/code/Magento/MediaStorage/Test/Unit/App/MediaTest.php
app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/ConfigTest.php 1 addition, 1 deletion

.../MediaStorage/Test/Unit/Model/File/Storage/ConfigTest.php
app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/Directory/DatabaseTest.php 9 additions, 0 deletions

...e/Test/Unit/Model/File/Storage/Directory/DatabaseTest.php
app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/RequestTest.php 1 addition, 11 deletions

...MediaStorage/Test/Unit/Model/File/Storage/RequestTest.php
app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/SynchronizationTest.php 7 additions, 33 deletions

...rage/Test/Unit/Model/File/Storage/SynchronizationTest.php
app/code/Magento/Theme/Console/Command/ThemeUninstallCommand.php 21 additions, 22 deletions

...e/Magento/Theme/Console/Command/ThemeUninstallCommand.php
app/code/Magento/Theme/Model/ThemeValidator.php 5 additions, 5 deletions

app/code/Magento/Theme/Model/ThemeValidator.php
app/code/Magento/Theme/Test/Unit/Console/Command/ThemeUninstallCommandTest.php 53 additions, 26 deletions

...e/Test/Unit/Console/Command/ThemeUninstallCommandTest.php
app/code/Magento/Theme/Test/Unit/Model/ThemeValidatorTest.php 3 additions, 3 deletions

...code/Magento/Theme/Test/Unit/Model/ThemeValidatorTest.php
app/code/Magento/Translation/Console/Command/UninstallLanguageCommand.php 3 additions, 1 deletion

.../Translation/Console/Command/UninstallLanguageCommand.php
app/code/Magento/Translation/Test/Unit/Console/Command/UninstallLanguageCommandTest.php 4 additions, 4 deletions

...est/Unit/Console/Command/UninstallLanguageCommandTest.php
composer.json 1 addition, 0 deletions

composer.json
composer.lock 14 additions, 13 deletions

composer.lock

with 363 additions and 391 deletions

Please register or to comment

Admin message

Merge pull request #384 from magento-ogre/PR_Branch