Merge pull request #62 from magento-vanilla/MAGETWO-31191 (8f096642) · Commits · KIII-12 / Magento

Commit 8f096642 authored 10 years ago by

dvilchynskyi

Merge pull request #62 from magento-vanilla/MAGETWO-31191

[Vanilla] Sprint 10

parents 8892e7bd 9d05b995

Branches

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Gruntfile.js 38 additions, 3 deletions

Gruntfile.js
app/code/Magento/AdminNotification/view/adminhtml/requirejs-config.js 3 additions, 5 deletions

...ento/AdminNotification/view/adminhtml/requirejs-config.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/toolbar_entry.phtml 1 addition, 1 deletion

...Notification/view/adminhtml/templates/toolbar_entry.phtml
app/code/Magento/AdminNotification/view/adminhtml/web/toolbar_entry.js 90 additions, 91 deletions

...nto/AdminNotification/view/adminhtml/web/toolbar_entry.js
app/code/Magento/Backend/Block/System/Config/Form/Fieldset.php 1 addition, 1 deletion

...ode/Magento/Backend/Block/System/Config/Form/Fieldset.php
app/code/Magento/Backend/Block/Widget/Button/SplitButton.php 1 addition, 1 deletion

app/code/Magento/Backend/Block/Widget/Button/SplitButton.php
app/code/Magento/Backend/view/adminhtml/layout/default.xml 3 additions, 18 deletions

app/code/Magento/Backend/view/adminhtml/layout/default.xml
app/code/Magento/Backend/view/adminhtml/requirejs-config.js 0 additions, 41 deletions

app/code/Magento/Backend/view/adminhtml/requirejs-config.js
app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml 1 addition, 24 deletions

...agento/Backend/view/adminhtml/templates/admin/login.phtml
app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml 4 additions, 5 deletions

...to/Backend/view/adminhtml/templates/dashboard/index.phtml
app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml 24 additions, 19 deletions

...d/view/adminhtml/templates/dashboard/store/switcher.phtml
app/code/Magento/Backend/view/adminhtml/templates/menu.phtml 1 addition, 6 deletions

app/code/Magento/Backend/view/adminhtml/templates/menu.phtml
app/code/Magento/Backend/view/adminhtml/templates/page/js/head_scripts.phtml 0 additions, 17 deletions

...ckend/view/adminhtml/templates/page/js/head_scripts.phtml
app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml 0 additions, 5 deletions

...Backend/view/adminhtml/templates/page/js/require_js.phtml
app/code/Magento/Backend/view/adminhtml/templates/page/locale.phtml 10 additions, 6 deletions

...agento/Backend/view/adminhtml/templates/page/locale.phtml
app/code/Magento/Backend/view/adminhtml/templates/page/system/config/robots/reset.phtml 9 additions, 6 deletions

...adminhtml/templates/page/system/config/robots/reset.phtml
app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml 1 addition, 1 deletion

...agento/Backend/view/adminhtml/templates/pageactions.phtml
app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml 4 additions, 3 deletions

.../Backend/view/adminhtml/templates/system/cache/edit.phtml
app/code/Magento/Backend/view/adminhtml/templates/system/config/edit.phtml 270 additions, 272 deletions

...Backend/view/adminhtml/templates/system/config/edit.phtml

with 462 additions and 526 deletions

Please register or to comment

Admin message

Merge pull request #62 from magento-vanilla/MAGETWO-31191