Merge remote-tracking branch 'upstream/develop' into pr (8553cbc0) · Commits · KIII-12 / Magento

Commit 8553cbc0 authored 8 years ago by

Joan He

Merge remote-tracking branch 'upstream/develop' into pr

# Conflicts:
#	lib/internal/Magento/Framework/Serialize/Serializer/Json.php

parents 2ee6dbfd fa0ed968

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

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/Sales/view/adminhtml/layout/sales_order_create_index.xml 1 addition, 1 deletion

.../Sales/view/adminhtml/layout/sales_order_create_index.xml
app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml 1 addition, 1 deletion

...ento/UrlRewrite/view/adminhtml/templates/categories.phtml
app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml 1 addition, 1 deletion

...ew/adminhtml/templates/catalog/category/widget/tree.phtml
app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml 1 addition, 1 deletion

...idget/view/adminhtml/templates/instance/edit/layout.phtml
dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/GlobalSearchEntityTest.xml 5 additions, 0 deletions

.../Magento/Backend/Test/TestCase/GlobalSearchEntityTest.xml
dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderWithPayPalBraintreeVaultBackendTest.xml 1 addition, 1 deletion

...stCase/CreateOrderWithPayPalBraintreeVaultBackendTest.xml
dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml 10 additions, 1 deletion

...to/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml
dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.php 1 addition, 0 deletions

...to/Bundle/Test/TestCase/UpdateBundleProductEntityTest.php
dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/BlockGallery.php 49 additions, 0 deletions

...est/Block/Adminhtml/Product/Edit/Section/BlockGallery.php
dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.xml 1 addition, 1 deletion

...ento/Catalog/Test/Block/Adminhtml/Product/ProductForm.xml

with 138 additions and 38 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'upstream/develop' into pr