Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MAGETWO-44413 (c93aefca) · Commits · KIII-12 / Magento

Commit c93aefca authored 9 years ago by

Ievgen Sentiabov

Browse files

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

parents fe5dc7f5 f9206406

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

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/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
app/code/Magento/Checkout/Block/Onepage/Review/Button.php 0 additions, 29 deletions

app/code/Magento/Checkout/Block/Onepage/Review/Button.php
app/code/Magento/Checkout/Block/Onepage/Review/Info.php 0 additions, 49 deletions

app/code/Magento/Checkout/Block/Onepage/Review/Info.php
app/code/Magento/Checkout/Block/Onepage/Shipping.php 0 additions, 131 deletions

app/code/Magento/Checkout/Block/Onepage/Shipping.php
app/code/Magento/Checkout/Block/Onepage/Shipping/Method.php 0 additions, 37 deletions

app/code/Magento/Checkout/Block/Onepage/Shipping/Method.php
app/code/Magento/Checkout/Block/Onepage/Shipping/Method/Additional.php 0 additions, 16 deletions

...nto/Checkout/Block/Onepage/Shipping/Method/Additional.php
app/code/Magento/Checkout/Block/Onepage/Shipping/Method/Available.php 0 additions, 122 deletions

...ento/Checkout/Block/Onepage/Shipping/Method/Available.php
app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php 0 additions, 3 deletions

app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php 0 additions, 38 deletions

app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
app/code/Magento/Checkout/composer.json 0 additions, 1 deletion

app/code/Magento/Checkout/composer.json
app/code/Magento/Checkout/view/frontend/requirejs-config.js 1 addition, 4 deletions

app/code/Magento/Checkout/view/frontend/requirejs-config.js
app/code/Magento/Checkout/view/frontend/templates/onepage/billing.phtml 0 additions, 214 deletions

...to/Checkout/view/frontend/templates/onepage/billing.phtml
app/code/Magento/Checkout/view/frontend/templates/onepage/payment.phtml 0 additions, 31 deletions

...to/Checkout/view/frontend/templates/onepage/payment.phtml

with 70 additions and 1608 deletions

Please register or to comment

Admin message

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