Rohan Mitchell 8db09d9590 Merge branch 'report_download_namechange' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-report_download_namechange ...

Conflicts:
	app/controllers/spree/admin/reports_controller_decorator.rb

2015-01-09 11:48:23 +11:00

..

assets

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

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

controllers

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

2015-01-09 11:48:23 +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 'tax_cat_dropdown' of https://github.com/Matt-Yorkley/openfoodnetwork into Matt-Yorkley-tax_cat_dropdown

2015-01-08 09:09:20 +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

Extract date range form to partial

2015-01-08 10:31:51 +11:00