Merge pull request #2 from magento-vanilla/PR (bce20df1) · Commits · KIII-12 / Magento

Commit bce20df1 authored 9 years ago by

Korshenko, Olexii(okorshenko)

Merge pull request #2 from magento-vanilla/PR

[Vanilla] Stories + Tasks + Bugs

parents fcaeea9b e364ebe7

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/AdminNotification/Block/System/Messages.php 2 additions, 5 deletions

app/code/Magento/AdminNotification/Block/System/Messages.php
app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml 12 additions, 24 deletions

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

...minNotification/view/adminhtml/web/system/notification.js
app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml 11 additions, 4 deletions

...to/Backend/view/adminhtml/templates/dashboard/index.phtml
app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml 5 additions, 2 deletions

...nto/Backend/view/adminhtml/templates/media/uploader.phtml
app/code/Magento/Backend/view/adminhtml/templates/page/locale.phtml 13 additions, 8 deletions

...agento/Backend/view/adminhtml/templates/page/locale.phtml
app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml 17 additions, 6 deletions

...nto/Backend/view/adminhtml/templates/store/switcher.phtml
app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml 1 addition, 1 deletion

...tml/templates/widget/form/renderer/fieldset/element.phtml
app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml 23 additions, 25 deletions

...ento/Backup/view/adminhtml/templates/backup/dialogs.phtml
app/code/Magento/Braintree/view/frontend/web/js/cc-edit-form.js 8 additions, 3 deletions

...de/Magento/Braintree/view/frontend/web/js/cc-edit-form.js
app/code/Magento/Braintree/view/frontend/web/js/cc-form.js 5 additions, 2 deletions

app/code/Magento/Braintree/view/frontend/web/js/cc-form.js
app/code/Magento/Bundle/view/adminhtml/web/js/bundle-product.js 14 additions, 37 deletions

...de/Magento/Bundle/view/adminhtml/web/js/bundle-product.js
app/code/Magento/Catalog/Ui/Component/ColumnFactory.php 4 additions, 4 deletions

app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
app/code/Magento/Catalog/Ui/Component/Listing/Columns.php 26 additions, 0 deletions

app/code/Magento/Catalog/Ui/Component/Listing/Columns.php
app/code/Magento/Catalog/Ui/Component/Listing/Columns/Price.php 1 addition, 1 deletion

...de/Magento/Catalog/Ui/Component/Listing/Columns/Price.php
app/code/Magento/Catalog/Ui/Component/Listing/Filters.php 0 additions, 48 deletions

app/code/Magento/Catalog/Ui/Component/Listing/Filters.php
app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit.phtml 17 additions, 6 deletions

...alog/view/adminhtml/templates/catalog/category/edit.phtml
app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml 453 additions, 503 deletions

...alog/view/adminhtml/templates/catalog/category/tree.phtml
app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml 4 additions, 3 deletions

.../adminhtml/templates/catalog/product/attribute/form.phtml
app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml 48 additions, 30 deletions

...ew/adminhtml/templates/catalog/product/attribute/js.phtml

with 680 additions and 717 deletions

Please register or to comment

Admin message

Merge pull request #2 from magento-vanilla/PR