Will Marshall d7ff1cd4af Merge branch 'laura_and_will' into new_cart ...

Conflicts:
	app/views/checkout/_payment.html.haml
	app/views/checkout/_shipping.html.haml
	app/views/shop/products/_master.html.haml
	app/views/shop/products/_variants.html.haml

2014-07-24 10:39:36 +10:00

..

assets

Merge branch 'laura_and_will' into new_cart

2014-07-24 10:39:36 +10:00

controllers

Merge branch 'laura_and_will' into new_cart

2014-07-18 17:02:19 +10:00

helpers

Merge branch 'laura_and_will' into new_cart

2014-07-18 17:02:19 +10:00

mailers

Adding a signup confirmation email

2014-04-08 18:06:49 +10:00

models

Merge branch 'laura_and_will' into new_cart

2014-07-18 17:02:19 +10:00

overrides

Send distributor and order cycle id to order add variant autocomplete search

2014-07-16 09:33:59 +10:00

presenters

Simplify exchange products/variants JSON output format, bind angular to this

2013-01-10 10:59:53 +11:00

serializers/api

Merge branch 'caching' into new_cart

2014-07-18 11:23:25 +10:00

views

Merge branch 'laura_and_will' into new_cart

2014-07-24 10:39:36 +10:00