Rafael Schouten e9dd863462 Merge branch 'master' into payment_description ...

Conflicts:
	app/views/spree/order_mailer/confirm_email.text.erb

2014-09-17 17:07:43 +10:00

..

_authentication.html.haml

Merge changes

2014-05-14 15:55:18 +10:00

_billing.html.haml

Adding missing data-bindings for country/state

2014-08-28 14:25:21 +10:00

_details.html.haml

Adding missing data-bindings for country/state

2014-08-28 14:25:21 +10:00

_form.html.haml

Special Instructions in checkout are actually wired up

2014-09-06 12:00:27 +10:00

_order.rabl

Moving payment methods and shipping methods into their own services

2014-07-17 14:19:39 +10:00

_payment.html.haml

add payment description to checkout

2014-09-17 14:56:29 +10:00

_shipping.html.haml

Adding missing data-bindings for country/state

2014-08-28 14:25:21 +10:00

_summary.html.haml

add spree currency helper, fix some typos and specs

2014-09-11 11:47:55 +10:00

edit.html.haml

Don't add payment forms to checkout DOM unless required

2014-08-27 15:09:41 +10:00