Will Marshall f7c71568df Merge branch 'laura_and_will' ...

Conflicts:
	app/models/spree/variant_decorator.rb
	db/schema.rb
	spec/models/spree/product_spec.rb
	spec/models/spree/variant_spec.rb

2014-06-13 12:42:14 +10:00

..

assets

Merge branch 'laura_and_will'

2014-06-13 12:42:14 +10:00

controllers

Remove redirect to certified hostname - this is now performed by nginx. Fixes SSL errors.

2014-06-12 14:59:27 +10:00

helpers

Orders and fulfilment report handles order cycles with nil opening or closing times

2014-06-12 11:49:54 +10:00

mailers

Adding a signup confirmation email

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

models

Merge branch 'laura_and_will'

2014-06-13 12:42:14 +10:00

overrides

Remove unused overrides for primary taxons and product/new

2014-05-30 15:48:36 +10:00

presenters

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

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

views

Merge branch 'laura_and_will'

2014-06-13 12:42:14 +10:00