Will Marshall a2da7f7ede Merge branch 'caching' into new_cart ...

Conflicts:
	app/serializers/api/variant_serializer.rb

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

..

assets

Starting to restructure data injection

2014-07-18 11:21:51 +10:00

controllers

Merge branch 'caching' into new_cart

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

helpers

Starting to restructure data injection

2014-07-18 11:21:51 +10:00

mailers

Adding a signup confirmation email

2014-04-04 12:36:33 +13:00

models

Reworking order populator and controller to handle replacement of line items rather than addition

2014-07-16 16:00:28 +10:00

overrides

Merge branch 'bug-herd' into working

2014-07-03 14:24:39 +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

Renaming Product to Products and starting to figure out cart

2014-07-17 15:04:39 +10:00