Maikel Linke 17f168ed06 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into uk/account-balances ...

Applied code conventions.

Conflicts:
	config/locales/en.yml

2016-03-30 13:30:44 +11:00

..

archive/features/consumer

Special Instructions in checkout are actually wired up

2014-09-06 12:00:27 +10:00

controllers

Merge branch 'master' into products-caching

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

features

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

2016-03-30 13:30:44 +11:00

helpers

More serializer specs

2015-12-22 15:09:24 +00:00

javascripts

Update spec with nulls

2016-03-03 07:18:49 +00:00

jobs

Add products cache integrity checker

2016-02-24 15:05:03 +11:00

lib

Refresh products cache when inventory items are changed

2016-03-09 14:07:04 +11:00

mailers

Display footer_email in confirmation emails correctly

2016-02-26 16:09:14 +11:00

models

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

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

performance

Make benchmark more realistic

2015-11-13 14:03:07 +11:00

requests

Using date and time of current timezone

2015-12-10 11:38:41 +11:00

serializers

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

2016-03-09 14:43:05 +11:00

support

Fix compatibility issues with new version of select2

2016-02-24 11:26:37 +11:00

views/json

Removing stupid unusable spec

2015-04-09 17:20:31 +10:00

factories.rb

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

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

spec_helper.rb

Do not show knapsack time offset warnings unless in CI

2016-02-24 15:05:01 +11:00