Rohan Mitchell d908701b59 Merge branch 'master' into folklabs-producer-emails ...

Conflicts:
	Gemfile

2015-06-11 17:02:34 +10:00

..

admin

Merge branch 'master' into folklabs-producer-emails

2015-06-11 17:02:34 +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

Merge branch 'handle-invalid-referer-urls' into combined/xero-report_analytics-bugfixes

2015-06-05 14:23:58 +10:00

application_controller.rb

Handle invalid referer URLs

2015-06-05 12:43:49 +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

On enterprise confirmation: create a new user based on enterprise contact email if one does not already exist, and add it as a manager

2015-04-17 10:24:37 +10: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

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

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

When loading products for shopfront, load all master variants in one go

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