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

..

admin

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

api

Specify controller specs as such

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

spree

Fix deprecation notices

2016-01-07 10:51:39 +11:00

base_controller_spec.rb

Specify controller specs as such

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

cart_controller_spec.rb

Fixing broken specs

2015-04-17 13:00:20 +10:00

checkout_controller_spec.rb

Spec moved to OpenFoodNetwork::LastUsedAddress

2015-12-11 13:25:40 +11:00

enterprise_confirmations_controller_spec.rb

Fixing issue with auto-creation of new contact user for enterprises caused by delayed-job

2015-06-12 01:49:37 +08:00

enterprises_controller_spec.rb

Adding preferences to enterprises for sorting of order cycles in shopfront list

2015-12-16 11:55:23 +11:00

groups_controller_spec.rb

Dereferencing groups and adding modals to page

2014-06-24 17:15:31 +10:00

registration_controller_spec.rb

Remove unrequired store registration action

2014-10-17 11:01:39 +11:00

shop_controller_spec.rb

Extract product JSON rendering to lib class. Fix HTML stripping that never actually worked.

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

shops_controller_spec.rb

Merge branch 'master' into redesign

2015-06-10 18:27:50 +10:00

user_passwords_controller_spec.rb

Run password reset job for spec that requires it

2015-04-22 07:32:22 +10:00

user_registrations_controller_spec.rb

Don't override devise's after_sign_in_path_for, use specific before filters for user sessions and registrations controllers instead

2015-04-16 16:56:27 +10:00