Rohan Mitchell 422061f137 Merge branch 'master' into products-caching ...

Conflicts:
	app/controllers/shop_controller.rb
	app/models/enterprise_fee.rb
	app/models/order_cycle.rb
	app/models/variant_override.rb
	db/schema.rb
	lib/open_food_network/products_renderer.rb
	spec/lib/open_food_network/products_renderer_spec.rb

2016-03-03 09:42:52 +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' into products-caching

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

helpers

Reorganising busines model config settings, moving account invoice tax rate in busines model config settings

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

javascripts

Automatically selecting a hub on inventory page when it is the only option

2016-03-02 12:10:49 +11:00

jobs

Add products cache integrity checker

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

lib

Merge branch 'master' into products-caching

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

mailers

Display footer_email in confirmation emails correctly

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

models

Merge branch 'master' into products-caching

2016-03-03 09:42:52 +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

OC Coordinators can opt to restrict products in an order cycle to those in their inventory only

2016-03-02 12:10:22 +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

Merge branch 'master' into products-caching

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

spec_helper.rb

Do not show knapsack time offset warnings unless in CI

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