Maikel Linke b641de6ec9 Merge branch 'group-pages' of github.com:openfoodfoundation/openfoodnetwork into group-pages ...

Conflicts:
	app/views/groups/show.html.haml

2015-02-05 15:52:00 +11:00

..

assets

Merge branch 'group-pages' of github.com:openfoodfoundation/openfoodnetwork into group-pages

2015-02-05 15:52:00 +11:00

controllers

make groups editable by group owners

2015-02-05 12:05:39 +11:00

helpers

Merge branch 'lin-d-hop-266reportsbranch'

2014-12-19 16:51:38 +11:00

mailers

Add rails-i18n gem.

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

models

make groups editable by group owners

2015-02-05 12:05:39 +11:00

overrides

make groups editable by group owners

2015-02-05 12:05:39 +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 'group-pages' of github.com:openfoodfoundation/openfoodnetwork into group-pages

2015-02-05 15:52:00 +11:00