Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-59215 (e70ada46) · Commits · KIII-12 / Magento

Commit e70ada46 authored 8 years ago by

Andrii Dimov

Browse files

Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-59215

parents 9b5e2b9c fa0ed968

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Model/Product/Image.php 1 addition, 2 deletions

app/code/Magento/Catalog/Model/Product/Image.php
app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php 2 additions, 2 deletions

...ode/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php
app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ImagesTest.php 23 additions, 1 deletion

...Unit/Ui/DataProvider/Product/Form/Modifier/ImagesTest.php
app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Images.php 15 additions, 0 deletions

.../Catalog/Ui/DataProvider/Product/Form/Modifier/Images.php
app/code/Magento/CatalogInventory/Setup/UpgradeData.php 1 addition, 1 deletion

app/code/Magento/CatalogInventory/Setup/UpgradeData.php
app/code/Magento/CatalogInventory/etc/module.xml 1 addition, 1 deletion

app/code/Magento/CatalogInventory/etc/module.xml
app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml 12 additions, 21 deletions

...view/frontend/templates/product/widget/content/grid.phtml
app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml 2 additions, 2 deletions

.../Cms/view/adminhtml/templates/browser/content/files.phtml
app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml 1 addition, 1 deletion

...s/view/adminhtml/templates/browser/content/uploader.phtml
app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml 2 additions, 2 deletions

...e/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
app/code/Magento/Cms/view/frontend/templates/widget/link/link_block.phtml 5 additions, 1 deletion

.../Cms/view/frontend/templates/widget/link/link_block.phtml
app/code/Magento/Cms/view/frontend/templates/widget/link/link_inline.phtml 5 additions, 1 deletion

...Cms/view/frontend/templates/widget/link/link_inline.phtml
app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php 1 addition, 5 deletions

...code/Magento/Customer/Controller/Adminhtml/Index/Save.php
app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php 32 additions, 86 deletions

...ustomer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php 3 additions, 3 deletions

...agento/Customer/Test/Unit/Model/AccountManagementTest.php
app/code/Magento/Integration/Model/Config.php 20 additions, 4 deletions

app/code/Magento/Integration/Model/Config.php
app/code/Magento/Integration/Model/ConsolidatedConfig.php 16 additions, 4 deletions

app/code/Magento/Integration/Model/ConsolidatedConfig.php
app/code/Magento/Integration/Model/IntegrationConfig.php 16 additions, 4 deletions

app/code/Magento/Integration/Model/IntegrationConfig.php
app/code/Magento/Integration/Test/Unit/Model/ConsolidatedConfigTest.php 28 additions, 9 deletions

...to/Integration/Test/Unit/Model/ConsolidatedConfigTest.php
app/code/Magento/Integration/Test/Unit/Model/IntegrationConfigTest.php 29 additions, 9 deletions

...nto/Integration/Test/Unit/Model/IntegrationConfigTest.php

with 215 additions and 159 deletions

Please register or to comment

Admin message

Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-59215