Maikel Linke ef0d6bd4d6 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into state_translation_override ...

Conflicts:
	spec/lib/open_food_network/order_cycle_management_report_spec.rb

2016-04-15 08:27:09 +10:00

..

archive/features/consumer

Special Instructions in checkout are actually wired up

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

controllers

Report job queue status via API

2016-04-13 16:48:24 +10:00

features

Removing ability to create order discount rules

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

helpers

Applying shipping method rules in checkout

2016-04-01 19:48:25 +11:00

javascripts

Updating Tag Rules UI to allow management of new FilterShippingMethods rule type

2016-04-01 19:48:25 +11:00

jobs

Run a job queue heartbeat every 5 minutes

2016-04-13 16:48:24 +10:00

lib

Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into state_translation_override

2016-04-15 08:27:09 +10:00

mailers

Display footer_email in confirmation emails correctly

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

models

Add default logos and home_hero

2016-04-08 14:41:44 +10: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

Updating Tag Rules UI to allow management of new FilterShippingMethods rule type

2016-04-01 19:48:25 +11:00

spec_helper.rb

Do not show knapsack time offset warnings unless in CI

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