Merge branch 'develop' of github.com:magento/magento2ce into troll_bugfix (6d3e655d) · Commits · KIII-12 / Magento

Commit 6d3e655d authored 8 years ago by

Roman Ganin

Browse files

Merge branch 'develop' of github.com:magento/magento2ce into troll_bugfix

parents 702fb2a8 ada45cc9

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

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/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
app/code/Magento/Marketplace/Helper/Cache.php 13 additions, 4 deletions

app/code/Magento/Marketplace/Helper/Cache.php
app/code/Magento/Marketplace/Test/Unit/Helper/CacheTest.php 53 additions, 44 deletions

app/code/Magento/Marketplace/Test/Unit/Helper/CacheTest.php
app/code/Magento/Quote/Model/QueryResolver.php 13 additions, 3 deletions

app/code/Magento/Quote/Model/QueryResolver.php
app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php 6 additions, 2 deletions

...ode/Magento/Quote/Model/Quote/Address/Total/Collector.php
app/code/Magento/Quote/Test/Unit/Model/QueryResolverTest.php 46 additions, 29 deletions

app/code/Magento/Quote/Test/Unit/Model/QueryResolverTest.php
app/code/Magento/Sales/Model/Config/Ordered.php 14 additions, 3 deletions

app/code/Magento/Sales/Model/Config/Ordered.php
app/code/Magento/Sales/Model/Order/Total/Config/Base.php 6 additions, 2 deletions

app/code/Magento/Sales/Model/Order/Total/Config/Base.php

with 289 additions and 147 deletions

Please register or to comment

Admin message

Merge branch 'develop' of github.com:magento/magento2ce into troll_bugfix