Lynne Davis 3d150be8de Fixing conflicts

2015-07-18 16:39:03 +01:00

..

admin

Auto-merge from CI [skip ci]

2015-06-16 14:12:16 +10:00

api

Adding module - doh!

2015-05-07 12:50:56 +10:00

open_food_network

Make unused cart_controller happy

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

spree

Fixing conflicts

2015-07-18 16:39:03 +01:00

application_controller.rb

Split CSS to overcome IE9's 4096 rule limit

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

base_controller.rb

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

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

checkout_controller.rb

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

2015-05-27 15:44:01 +10: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

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

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

groups_controller.rb

Merge branch 'master' into optimise-shopfront

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

home_controller.rb

Make stats more accurate by excluding invisible, inactivated enterprises and incomplete orders

2015-06-11 12:53:23 +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

Perform variant override scoping on product/variant by external class. Centralise this so we can load everything in one go.

2015-06-18 13:11:11 +10: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