Rohan Mitchell 16741598fd Merge branch 'master' into products-caching ...

Conflicts:
	spec/features/admin/variant_overrides_spec.rb

2016-03-18 09:59:56 +11:00

..

assets

Use user's email address as enterprise.email

2016-03-09 14:52:52 +11:00

controllers

Move OpenFoodNetwork::ProductsCacheIntegrityChecker.active_exchanges to Exchange model

2016-03-09 12:28:09 +11:00

helpers

WIP: Adding infrastructure to show/hide variants + overrides using inventory items

2016-03-02 12:10:22 +11:00

jobs

Extract integrity checking to lib class

2016-03-02 11:01:41 +11:00

mailers

Cleaning up and attempt to add feature spec

2016-01-15 09:07:49 +11:00

models

Merge branch 'master' into products-caching

2016-03-18 09:59:56 +11:00

overrides

Merge branch 'master' into products-caching

2016-03-03 09:42:52 +11:00

presenters

Adding option to 'Inherit From Product' for enterprise_fee tax categories

2016-03-02 11:56:46 +11:00

serializers/api

Merge branch 'master' into products-caching

2016-03-18 09:59:56 +11:00

views

Merge branch 'master' into products-caching

2016-03-18 09:59:56 +11:00