summerscope 9587b2a2ed Merge branch 'laura_and_will' of github.com:openfoodfoundation/openfoodnetwork into laura_and_will ...

Conflicts:
	app/views/producers/_filters.html.haml

2014-07-09 16:18:41 +10:00

..

assets

Merge branch 'laura_and_will' of github.com:openfoodfoundation/openfoodnetwork into laura_and_will

2014-07-09 16:18:41 +10:00

controllers

Initialise enterprise country in controller, not model. Fixes address SQL load every time an enterprise is instanciated.

2014-07-04 14:39:27 +10:00

helpers

Adding dereferencing to taxons and reducing our data-set

2014-07-04 14:38:27 +10:00

mailers

Adding a signup confirmation email

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

models

Update spree and spree_auth_devise

2014-07-04 17:07:58 +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

Minor code formatting changes

2014-07-04 14:39:26 +10:00

views

Merge branch 'laura_and_will' of github.com:openfoodfoundation/openfoodnetwork into laura_and_will

2014-07-09 16:18:41 +10:00