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

2016-01-31 21:35:44 +11:00

..

assets

Merge branch 'uk/account-balances' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances

2016-01-30 19:53:53 +00:00

controllers

Refactoring VariantOverridesController#bulk_reset to only reset VOs for a specified hub

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

helpers

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

2016-01-25 04:43:25 +11:00

jobs

Formatting dates for account invoices in rails time zone

2015-12-17 11:34:06 +11:00

mailers

Cleaning up and attempt to add feature spec

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

models

Merge branch 'uk/account-balances' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances

2016-01-30 19:53:53 +00:00

overrides

Adding BMC link to configurations menu

2015-12-16 19:18:57 +11:00

presenters

Admin can set enterprise fee's tax category

2015-03-05 10:44:25 +11:00

serializers/api

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

2016-01-31 21:35:44 +11:00

views

Merge branch 'uk/account-balances' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances

2016-01-30 19:53:53 +00:00