Merge branch 'develop' of github.com:magento/magento2ce into bugfixes
Showing
- app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml 14 additions, 3 deletions...gento/AdminNotification/view/adminhtml/layout/default.xml
- app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php 1 addition, 0 deletions...Magento/Backend/Block/Page/System/Config/Robots/Reset.php
- app/code/Magento/Backend/Test/Unit/Block/Page/System/Config/Robots/ResetTest.php 5 additions, 0 deletions...d/Test/Unit/Block/Page/System/Config/Robots/ResetTest.php
- app/code/Magento/Braintree/view/adminhtml/layout/sales_order_create_index.xml 3 additions, 3 deletions...intree/view/adminhtml/layout/sales_order_create_index.xml
- app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php 1 addition, 1 deletion...ode/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
- app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionPriceTest.php 61 additions, 0 deletions...ndle/Test/Unit/Pricing/Price/BundleSelectionPriceTest.php
- app/code/Magento/Bundle/view/base/web/js/price-bundle.js 1 addition, 1 deletionapp/code/Magento/Bundle/view/base/web/js/price-bundle.js
- app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml 1 addition, 1 deletion...view/frontend/layout/catalog_product_view_type_bundle.xml
- app/code/Magento/Catalog/Pricing/Price/TierPrice.php 1 addition, 1 deletionapp/code/Magento/Catalog/Pricing/Price/TierPrice.php
- app/code/Magento/Catalog/Setup/CategorySetup.php 12 additions, 0 deletionsapp/code/Magento/Catalog/Setup/CategorySetup.php
- app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php 2 additions, 1 deletion...Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php
- app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_edit.xml 3 additions, 1 deletion...atalog/view/adminhtml/layout/catalog_product_set_edit.xml
- app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml 3 additions, 3 deletions...nto/Catalog/view/frontend/layout/catalog_product_view.xml
- app/code/Magento/CatalogRule/view/adminhtml/layout/catalog_rule_promo_catalog_edit.xml 10 additions, 10 deletions...view/adminhtml/layout/catalog_rule_promo_catalog_edit.xml
- app/code/Magento/Config/view/adminhtml/templates/page/system/config/robots/reset.phtml 1 addition, 0 deletions...adminhtml/templates/page/system/config/robots/reset.phtml
- app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_set_edit.xml 4 additions, 1 deletion...roduct/view/adminhtml/layout/catalog_product_set_edit.xml
- app/code/Magento/Cookie/view/frontend/layout/default.xml 1 addition, 1 deletionapp/code/Magento/Cookie/view/frontend/layout/default.xml
- app/code/Magento/Customer/Controller/Account/EditPost.php 31 additions, 4 deletionsapp/code/Magento/Customer/Controller/Account/EditPost.php
- app/code/Magento/Customer/Controller/Address/FormPost.php 23 additions, 6 deletionsapp/code/Magento/Customer/Controller/Address/FormPost.php
- app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php 127 additions, 0 deletions...nto/Customer/Controller/Adminhtml/File/Address/Upload.php
Please register or sign in to comment