Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MAGETWO-49154-updated (146fa881) · Commits · KIII-12 / Magento

Commit 146fa881 authored 9 years ago by

Stanislav Lopukhov

Browse files

Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MAGETWO-49154-updated

parents 80e8984a b04dffaf

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 5 additions, 8 deletions

.travis.yml
README.md 1 addition, 1 deletion

README.md
app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTest.php 1 addition, 2 deletions

.../Model/Import/AdvancedPricing/Validator/TierPriceTest.php
app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php 1 addition, 1 deletion

...it/Model/Import/AdvancedPricing/Validator/WebsiteTest.php
app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/ValidatorTest.php 1 addition, 1 deletion

.../Test/Unit/Model/Import/AdvancedPricing/ValidatorTest.php
app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php 1 addition, 1 deletion

...portExport/Test/Unit/Model/Import/AdvancedPricingTest.php
app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Indexer/Product/Price/Plugin/ImportTest.php 1 addition, 1 deletion

...st/Unit/Model/Indexer/Product/Price/Plugin/ImportTest.php
app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php 2 additions, 1 deletion

...net/Test/Unit/Controller/Directpost/Payment/PlaceTest.php
app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/SessionTest.php 1 addition, 1 deletion

...o/Authorizenet/Test/Unit/Model/Directpost/SessionTest.php
app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Date.php 13 additions, 10 deletions

...agento/Backend/Block/Widget/Grid/Column/Renderer/Date.php
app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Datetime.php 7 additions, 3 deletions

...to/Backend/Block/Widget/Grid/Column/Renderer/Datetime.php
app/code/Magento/Backend/Model/Auth/Session.php 10 additions, 1 deletion

app/code/Magento/Backend/Model/Auth/Session.php
app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Renderer/ConcatTest.php 2 additions, 1 deletion

...est/Unit/Block/Widget/Grid/Column/Renderer/ConcatTest.php
app/code/Magento/Backend/Test/Unit/Console/Command/AbstractCacheCommandTest.php 1 addition, 1 deletion

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

...t/Unit/Console/Command/AbstractCacheManageCommandTest.php
app/code/Magento/Backend/Test/Unit/Console/Command/CacheCleanCommandTest.php 1 addition, 1 deletion

...ckend/Test/Unit/Console/Command/CacheCleanCommandTest.php
app/code/Magento/Backend/Test/Unit/Console/Command/CacheDisableCommandTest.php 1 addition, 1 deletion

...end/Test/Unit/Console/Command/CacheDisableCommandTest.php
app/code/Magento/Backend/Test/Unit/Console/Command/CacheEnableCommandTest.php 1 addition, 1 deletion

...kend/Test/Unit/Console/Command/CacheEnableCommandTest.php
app/code/Magento/Backend/Test/Unit/Console/Command/CacheFlushCommandTest.php 1 addition, 1 deletion

...ckend/Test/Unit/Console/Command/CacheFlushCommandTest.php
app/code/Magento/Backend/Test/Unit/Console/Command/CacheStatusCommandTest.php 1 addition, 1 deletion

...kend/Test/Unit/Console/Command/CacheStatusCommandTest.php

with 53 additions and 39 deletions

Please register or to comment

Admin message

Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MAGETWO-49154-updated