Merge remote-tracking branch 'origin/MAGETWO-59924' into BUGS (304bb0cb) · Commits · KIII-12 / Magento

Commit 304bb0cb authored 8 years ago by

Sviatoslav Mankivskyi

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

# Conflicts:
#	app/code/Magento/Catalog/Model/Category/DataProvider.php

parents ea115cac 65c0f571

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Model/Category/DataProvider.php 32 additions, 2 deletions

app/code/Magento/Catalog/Model/Category/DataProvider.php
app/code/Magento/Catalog/Model/Category/FileInfo.php 107 additions, 0 deletions

app/code/Magento/Catalog/Model/Category/FileInfo.php
app/code/Magento/Catalog/Test/Unit/Model/Category/DataProviderTest.php 320 additions, 0 deletions

...nto/Catalog/Test/Unit/Model/Category/DataProviderTest.php
app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php 114 additions, 0 deletions

...Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php
app/code/Magento/Catalog/view/adminhtml/web/template/image-preview.html 1 addition, 0 deletions

...to/Catalog/view/adminhtml/web/template/image-preview.html
app/code/Magento/Customer/Model/Customer/DataProvider.php 3 additions, 8 deletions

app/code/Magento/Customer/Model/Customer/DataProvider.php
app/code/Magento/Customer/Model/FileProcessor.php 50 additions, 36 deletions

app/code/Magento/Customer/Model/FileProcessor.php
app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php 6 additions, 0 deletions

...to/Customer/Test/Unit/Model/Customer/DataProviderTest.php
app/code/Magento/Customer/Test/Unit/Model/FileProcessorTest.php 32 additions, 0 deletions

...de/Magento/Customer/Test/Unit/Model/FileProcessorTest.php
app/code/Magento/Downloadable/view/adminhtml/web/template/components/file-uploader.html 8 additions, 1 deletion

...view/adminhtml/web/template/components/file-uploader.html
app/code/Magento/Theme/Model/Design/Backend/File.php 39 additions, 1 deletion

app/code/Magento/Theme/Model/Design/Backend/File.php
app/code/Magento/Theme/Model/Design/Config/FileUploader/FileProcessor.php 3 additions, 2 deletions

.../Theme/Model/Design/Config/FileUploader/FileProcessor.php
app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php 32 additions, 0 deletions

...Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
app/code/Magento/Theme/Test/Unit/Model/Design/Config/FileUploader/FileProcessorTest.php 8 additions, 1 deletion

...it/Model/Design/Config/FileUploader/FileProcessorTest.php
app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js 21 additions, 0 deletions

...Magento/Ui/view/base/web/js/form/element/file-uploader.js
app/code/Magento/Ui/view/base/web/templates/form/element/uploader/preview.html 8 additions, 3 deletions

...iew/base/web/templates/form/element/uploader/preview.html
app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html 10 additions, 0 deletions

...ew/base/web/templates/form/element/uploader/uploader.html
app/design/adminhtml/Magento/backend/web/css/source/components/_file-uploader.less 149 additions, 14 deletions

...nto/backend/web/css/source/components/_file-uploader.less
app/design/adminhtml/Magento/backend/web/css/source/variables/_icons.less 1 addition, 0 deletions

...html/Magento/backend/web/css/source/variables/_icons.less
app/design/adminhtml/Magento/backend/web/fonts/admin-icons/admin-icons.eot 0 additions, 0 deletions

...tml/Magento/backend/web/fonts/admin-icons/admin-icons.eot

with 944 additions and 68 deletions

Please register or to comment

Admin message

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