Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into MAGETWO-35665 (2af26fdc) · Commits · KIII-12 / Magento

Commit 2af26fdc authored 10 years ago by

Roman Ganin

Browse files

Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into MAGETWO-35665

parents 3df9f910 a2aa819c

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Gruntfile.js 0 additions, 8 deletions

Gruntfile.js
app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml 1 addition, 1 deletion

...cation/view/adminhtml/templates/notification/window.phtml
app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml 1 addition, 1 deletion

...tification/view/adminhtml/templates/system/messages.phtml
app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml 1 addition, 1 deletion

...tion/view/adminhtml/templates/system/messages/popup.phtml
app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js 6 additions, 8 deletions

...minNotification/view/adminhtml/web/system/notification.js
app/code/Magento/Backend/Block/Menu.php 1 addition, 1 deletion

app/code/Magento/Backend/Block/Menu.php
app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php 0 additions, 2 deletions

.../Magento/Backend/Block/System/Design/Edit/Tab/General.php
app/code/Magento/Backend/Block/Widget/Form.php 0 additions, 1 deletion

app/code/Magento/Backend/Block/Widget/Form.php
app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php 0 additions, 4 deletions

.../Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php 0 additions, 1 deletion

...ento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml 2 additions, 4 deletions

...Magento/Backend/view/adminhtml/templates/admin/page.phtml
app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml 1 addition, 1 deletion

...nto/Backend/view/adminhtml/templates/dashboard/grid.phtml
app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml 2 additions, 1 deletion

...o/Backend/view/adminhtml/templates/page/js/calendar.phtml
app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml 7 additions, 3 deletions

...w/adminhtml/templates/widget/form/renderer/fieldset.phtml
app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml 45 additions, 18 deletions

...agento/Backend/view/adminhtml/templates/widget/tabs.phtml
app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml 4 additions, 4 deletions

...ento/Backup/view/adminhtml/templates/backup/dialogs.phtml
app/code/Magento/Bundle/view/adminhtml/web/js/bundle-product.js 2 additions, 0 deletions

...de/Magento/Bundle/view/adminhtml/web/js/bundle-product.js
app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php 0 additions, 1 deletion

...g/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/NewCategory.php 1 addition, 1 deletion

...ento/Catalog/Block/Adminhtml/Product/Edit/NewCategory.php
app/code/Magento/Catalog/view/adminhtml/layout/catalog_category_edit.xml 1 addition, 0 deletions

...o/Catalog/view/adminhtml/layout/catalog_category_edit.xml

with 75 additions and 61 deletions

Please register or to comment

Admin message

Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into MAGETWO-35665