Rohan Mitchell c6db1d440c Merge branch 'add_shipping_category' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-add_shipping_category ...

Conflicts:
	app/overrides/spree/admin/products/new/replace_form.html.haml.deface
	app/views/spree/order_mailer/confirm_email.text.haml

2015-01-09 12:30:19 +11:00

..

assets

Merge remote-tracking branch 'origin/shopfront-filters'

2014-12-19 15:40:01 +11:00

controllers

Fix filename on order cycle management report csv, add timestamp to it and also users and enterprises report

2015-01-09 11:49:59 +11:00

helpers

Move private method to helper

2015-01-08 10:48:02 +11:00

mailers

Add rails-i18n gem.

2014-12-03 09:39:35 +11:00

models

Move money decorator to lib dir, as it's a decorator for a lib class, not a model

2015-01-08 10:39:14 +11:00

overrides

Merge branch 'add_shipping_category' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-add_shipping_category

2015-01-09 12:30:19 +11:00

presenters

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

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

serializers

Implementing primary taxon ordering on the shopfront

2014-12-19 14:05:23 +11:00

views

Merge branch 'add_shipping_category' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-add_shipping_category

2015-01-09 12:30:19 +11:00