Maikel Linke 813dff8af2 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into require-login

2016-04-01 11:04:36 +11:00

..

assets

Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into require-login

2016-04-01 11:04:36 +11:00

controllers

Move OpenFoodNetwork::ProductsCacheIntegrityChecker.active_exchanges to Exchange model

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

helpers

Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into require-login

2016-04-01 11:04:36 +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' of github.com:openfoodfoundation/openfoodnetwork into uk/account-balances

2016-03-30 13:30:44 +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

Auto-merged master into uk/account-balances on deployment.

2016-03-19 07:16:41 +11:00

views

Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into require-login

2016-04-01 11:04:36 +11:00