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

Merge branch 'master' into products-caching

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

api

WIP: BOM Refactor, adding for_line_items action to enterprises controller

2015-11-04 15:02:29 +11:00

open_food_network

Make unused cart_controller happy

2015-01-22 10:19:45 +11:00

spree

Move premature Spree::Order#update prevention up a level, for even greater efficiency gains

2016-01-07 12:09:57 +11:00

application_controller.rb

Split CSS to overcome IE9's 4096 rule limit

2015-06-16 11:57:50 +10:00

base_controller.rb

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

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

checkout_controller.rb

Extract last used address finding into service object

2015-12-11 13:06:59 +11:00

discourse_sso_controller.rb

UI integration of Discourse login

2016-01-07 19:01:09 +11:00

enterprise_confirmations_controller.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.rb

Remove legacy enterprises views - index, suppliers, distributors, show

2015-07-10 09:42:09 +10:00

groups_controller.rb

Merge branch 'master' into optimise-shopfront

2015-06-03 10:07:42 +10:00

home_controller.rb

Add config setting to enable/disable stats on home page

2015-07-17 16:06:49 +10:00

map_controller.rb

Load active distributors where they're needed rather than in most controllers

2015-05-27 15:44:01 +10:00

producers_controller.rb

Load active distributors where they're needed rather than in most controllers

2015-05-27 15:44:01 +10:00

registration_controller.rb

Remove unrequired store registration action

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

shop_controller.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.rb

Remove load_active_distributors call missed by merge

2015-06-10 18:38:32 +10:00

user_passwords_controller.rb

Allow request to specify a return value when calling user_passwords#edit

2015-04-17 10:21:25 +10:00

user_registrations_controller.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