Merge remote-tracking branch 'origin/develop' into MAGETWO-54836 (c228706f) · Commits · KIII-12 / Magento

There was an error fetching the commit references. Please try again later.

Commit c228706f authored 8 years ago by

Viktor Paladiychuk

Browse files

Merge remote-tracking branch 'origin/develop' into MAGETWO-54836

parents d147b8a5 4d8ec01a

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml 14 additions, 3 deletions

...gento/AdminNotification/view/adminhtml/layout/default.xml
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/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/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/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 deletion

app/code/Magento/Cookie/view/frontend/layout/default.xml
app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml 0 additions, 1 deletion

.../Customer/view/frontend/layout/customer_account_index.xml
app/code/Magento/Customer/view/frontend/web/js/password-strength-indicator.js 11 additions, 16 deletions

...tomer/view/frontend/web/js/password-strength-indicator.js
app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml 40 additions, 30 deletions

.../Magento/GiftMessage/view/frontend/templates/inline.phtml
app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-item-level.html 6 additions, 7 deletions

...e/view/frontend/web/template/gift-message-item-level.html
app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Name.php 1 addition, 1 deletion

...tion/Block/Adminhtml/Widget/Grid/Column/Renderer/Name.php
app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/NameTest.php 1 addition, 1 deletion

.../Block/Adminhtml/Widget/Grid/Column/Renderer/NameTest.php
app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_index.xml 0 additions, 3 deletions

...ion/view/adminhtml/layout/adminhtml_integration_index.xml
app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_new.xml 0 additions, 3 deletions

...ation/view/adminhtml/layout/adminhtml_integration_new.xml
app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions.phtml 1 addition, 1 deletion

...dminhtml/templates/integration/activate/permissions.phtml
app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml 15 additions, 17 deletions

...mplates/integration/activate/permissions/tab/webapi.phtml
app/code/Magento/Integration/view/adminhtml/web/integration.css 0 additions, 86 deletions

...de/Magento/Integration/view/adminhtml/web/integration.css
app/code/Magento/PageCache/view/frontend/web/js/page-cache.js 1 addition, 1 deletion

...code/Magento/PageCache/view/frontend/web/js/page-cache.js

with 115 additions and 190 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'origin/develop' into MAGETWO-54836