Merge remote-tracking branch 'mainline/develop' into goinc-bugsfixing (ef556ce6) · Commits · KIII-12 / Magento

Commit ef556ce6 authored 9 years ago by

Michail Slabko

Browse files

Merge remote-tracking branch 'mainline/develop' into goinc-bugsfixing

parents cf70c6db f9206406

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php 17 additions, 6 deletions

...to/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
app/code/Magento/Backend/Model/Session/AdminConfig.php 8 additions, 8 deletions

app/code/Magento/Backend/Model/Session/AdminConfig.php
app/code/Magento/Backend/Test/Unit/Model/Session/AdminConfigTest.php 8 additions, 11 deletions

...gento/Backend/Test/Unit/Model/Session/AdminConfigTest.php
app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml 1 addition, 1 deletion

...w/adminhtml/templates/widget/form/renderer/fieldset.phtml
app/code/Magento/Braintree/Model/PaymentMethod.php 3 additions, 0 deletions

app/code/Magento/Braintree/Model/PaymentMethod.php
app/code/Magento/Braintree/Test/Unit/Model/PaymentMethodTest.php 2 additions, 0 deletions

...e/Magento/Braintree/Test/Unit/Model/PaymentMethodTest.php
app/code/Magento/Braintree/view/adminhtml/templates/form.phtml 1 addition, 1 deletion

...ode/Magento/Braintree/view/adminhtml/templates/form.phtml
app/code/Magento/Braintree/view/frontend/layout/braintree_paypal_review.xml 1 addition, 1 deletion

...raintree/view/frontend/layout/braintree_paypal_review.xml
app/code/Magento/Braintree/view/frontend/templates/creditcard/index.phtml 1 addition, 1 deletion

.../Braintree/view/frontend/templates/creditcard/index.phtml
app/code/Magento/Braintree/view/frontend/web/template/payment/cc-form.html 4 additions, 1 deletion

...Braintree/view/frontend/web/template/payment/cc-form.html
app/code/Magento/Catalog/etc/di.xml 5 additions, 0 deletions

app/code/Magento/Catalog/etc/di.xml
app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml 1 addition, 1 deletion

...alog/view/adminhtml/templates/catalog/category/tree.phtml
app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js 1 addition, 4 deletions

...view/adminhtml/web/catalog/product/composite/configure.js
app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php 64 additions, 18 deletions

...CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
app/code/Magento/Checkout/Block/Onepage.php 4 additions, 43 deletions

app/code/Magento/Checkout/Block/Onepage.php
app/code/Magento/Checkout/Block/Onepage/AbstractOnepage.php 0 additions, 391 deletions

app/code/Magento/Checkout/Block/Onepage/AbstractOnepage.php
app/code/Magento/Checkout/Block/Onepage/Billing.php 0 additions, 235 deletions

app/code/Magento/Checkout/Block/Onepage/Billing.php
app/code/Magento/Checkout/Block/Onepage/Payment.php 0 additions, 69 deletions

app/code/Magento/Checkout/Block/Onepage/Payment.php
app/code/Magento/Checkout/Block/Onepage/Payment/Info.php 0 additions, 63 deletions

app/code/Magento/Checkout/Block/Onepage/Payment/Info.php
app/code/Magento/Checkout/Block/Onepage/Payment/Methods.php 0 additions, 113 deletions

app/code/Magento/Checkout/Block/Onepage/Payment/Methods.php

with 121 additions and 967 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'mainline/develop' into goinc-bugsfixing