summerscope d2d3a577ea Merging master into this branch to make it easy to pull for staging push

2015-01-15 17:38:35 +11:00

..

assets

Take two on disabled logic

2015-01-15 17:34:04 +11:00

controllers

Enterprise user can edit profiles it has permission to

2015-01-15 13:43:39 +11:00

helpers

On enterprise edit page, do not show side menu links we don't have permission to

2015-01-15 13:43:39 +11:00

mailers

Add rails-i18n gem.

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

models

Merging master into this branch to make it easy to pull for staging push

2015-01-15 17:38:35 +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

Merge branch 'master' into variant-overrides-frontend

2015-01-12 16:48:51 +11:00

views

Take two on disabled logic

2015-01-15 17:34:04 +11:00