Merge remote-tracking branch 'origin/MAGETWO-51604' into BUGS (924033b3) · Commits · KIII-12 / Magento

Commit 924033b3 authored 9 years ago by

Oleksandr Karpenko

Browse files

Merge remote-tracking branch 'origin/MAGETWO-51604' into BUGS

parents 380b5b2c db83d991

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Config/Model/Config/Backend/File.php 15 additions, 3 deletions

app/code/Magento/Config/Model/Config/Backend/File.php
app/code/Magento/Theme/Controller/Adminhtml/Design/Config/FileUploader/Save.php 7 additions, 7 deletions

.../Controller/Adminhtml/Design/Config/FileUploader/Save.php
app/code/Magento/Theme/Model/Design/Backend/Favicon.php 26 additions, 2 deletions

app/code/Magento/Theme/Model/Design/Backend/Favicon.php
app/code/Magento/Theme/Model/Design/Backend/File.php 156 additions, 0 deletions

app/code/Magento/Theme/Model/Design/Backend/File.php
app/code/Magento/Theme/Model/Design/Backend/Image.php 0 additions, 129 deletions

app/code/Magento/Theme/Model/Design/Backend/Image.php
app/code/Magento/Theme/Model/Design/Backend/Logo.php 24 additions, 2 deletions

app/code/Magento/Theme/Model/Design/Backend/Logo.php
app/code/Magento/Theme/Model/Design/Config/FileUploader/FileProcessor.php 10 additions, 10 deletions

.../Theme/Model/Design/Config/FileUploader/FileProcessor.php
app/code/Magento/Theme/Model/Design/Config/Storage.php 4 additions, 2 deletions

app/code/Magento/Theme/Model/Design/Config/Storage.php
app/code/Magento/Theme/Model/Design/Config/ValueChecker.php 9 additions, 5 deletions

app/code/Magento/Theme/Model/Design/Config/ValueChecker.php
app/code/Magento/Theme/Model/Design/Config/ValueProcessor.php 13 additions, 3 deletions

...code/Magento/Theme/Model/Design/Config/ValueProcessor.php
app/code/Magento/Theme/Model/ResourceModel/Design/Config/Collection.php 9 additions, 1 deletion

...to/Theme/Model/ResourceModel/Design/Config/Collection.php
app/code/Magento/Theme/Model/ResourceModel/Design/Config/Scope/Collection.php 3 additions, 1 deletion

...me/Model/ResourceModel/Design/Config/Scope/Collection.php
app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/Design/Config/FileUploader/SaveTest.php 5 additions, 5 deletions

...troller/Adminhtml/Design/Config/FileUploader/SaveTest.php
app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php 44 additions, 32 deletions

...Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
app/code/Magento/Theme/Test/Unit/Model/Design/Config/FileUploader/FileProcessorTest.php 9 additions, 9 deletions

...it/Model/Design/Config/FileUploader/FileProcessorTest.php
app/code/Magento/Theme/Test/Unit/Model/Design/Config/StorageTest.php 5 additions, 2 deletions

...gento/Theme/Test/Unit/Model/Design/Config/StorageTest.php
app/code/Magento/Theme/Test/Unit/Model/Design/Config/ValueCheckerTest.php 3 additions, 3 deletions

.../Theme/Test/Unit/Model/Design/Config/ValueCheckerTest.php
app/code/Magento/Theme/Test/Unit/Model/Design/Config/ValueProcessorTest.php 12 additions, 2 deletions

...heme/Test/Unit/Model/Design/Config/ValueProcessorTest.php
app/code/Magento/Theme/Test/Unit/Model/ResourceModel/Design/Config/Scope/CollectionTest.php 3 additions, 3 deletions

...odel/ResourceModel/Design/Config/Scope/CollectionTest.php

with 357 additions and 221 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'origin/MAGETWO-51604' into BUGS