Lynne Davis 3a083723f0 Merge branch 'uk/trial-length' of https://github.com/openfoodfoundation/openfoodnetwork into uk/trial-length

2016-03-16 12:36:25 +00:00

..

assets

Use user's email address as enterprise.email

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

controllers

Auto-merged master into uk/trial-length on deployment.

2016-03-16 22:42:50 +11:00

helpers

Auto-merged master into uk/trial-length on deployment.

2016-03-16 22:42:50 +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

Auto-merged master into uk/trial-length on deployment.

2016-03-16 22:42:50 +11:00

overrides

Renaming 'Variant Overrides' index page to 'Inventory'

2016-03-02 12:10:22 +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 remote-tracking branch 'origin/master' into groups

2016-03-02 15:31:35 +11:00

views

Merge branch 'uk/trial-length' of https://github.com/openfoodfoundation/openfoodnetwork into uk/trial-length

2016-03-16 12:36:25 +00:00