Merge branch 'develop' into product-video-PR3 (cdf245fc) · Commits · KIII-12 / Magento

Commit cdf245fc authored 9 years ago by

Igor Miniailo

Browse files

Merge branch 'develop' into product-video-PR3

parents c344da3e e4716a3e

Branches

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/Authorizenet/view/adminhtml/templates/directpost/info.phtml 9 additions, 6 deletions

...thorizenet/view/adminhtml/templates/directpost/info.phtml
app/code/Magento/Authorizenet/view/frontend/web/js/view/payment/method-renderer/authorizenet-directpost.js 1 addition, 2 deletions

...s/view/payment/method-renderer/authorizenet-directpost.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/etc/frontend/di.xml 7 additions, 0 deletions

app/code/Magento/Braintree/etc/frontend/di.xml
app/code/Magento/Braintree/view/adminhtml/templates/data_js.phtml 3 additions, 4 deletions

.../Magento/Braintree/view/adminhtml/templates/data_js.phtml
app/code/Magento/Braintree/view/adminhtml/templates/form.phtml 97 additions, 64 deletions

...ode/Magento/Braintree/view/adminhtml/templates/form.phtml
app/code/Magento/Braintree/view/frontend/templates/creditcard/delete.phtml 22 additions, 14 deletions

...Braintree/view/frontend/templates/creditcard/delete.phtml
app/code/Magento/Braintree/view/frontend/templates/creditcard/edit.phtml 85 additions, 111 deletions

...o/Braintree/view/frontend/templates/creditcard/edit.phtml
app/code/Magento/Braintree/view/frontend/templates/creditcard/index.phtml 22 additions, 14 deletions

.../Braintree/view/frontend/templates/creditcard/index.phtml
app/code/Magento/Braintree/view/frontend/templates/data_js.phtml 2 additions, 2 deletions

...e/Magento/Braintree/view/frontend/templates/data_js.phtml
app/code/Magento/Braintree/view/frontend/templates/form.phtml 98 additions, 56 deletions

...code/Magento/Braintree/view/frontend/templates/form.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

with 454 additions and 356 deletions

Please register or to comment

Admin message

Merge branch 'develop' into product-video-PR3