Rafael Schouten 89ce4ba632 Merge branch 'master' into bugfix ...

Conflicts:
	app/models/enterprise.rb

2014-10-21 08:51:23 +11:00

..

admin

rename check methods

2014-10-16 16:26:49 +11:00

api

Adding images to registration process

2014-09-19 12:41:24 +10:00

devise

Redirect to admin root after confirmation

2014-10-16 16:06:54 +11:00

open_food_network

Rename OpenFoodWeb namespace to OpenFoodNetwork

2013-10-18 17:29:55 +11:00

spree

Merge branch 'master' into bugfix

2014-10-21 08:51:23 +11:00

application_controller.rb

Remove redirect to certified hostname - this is now performed by nginx. Fixes SSL errors.

2014-06-12 14:59:27 +10:00

base_controller.rb

Minor refactoring from code review with Rohan

2014-06-19 11:41:24 +10:00

checkout_controller.rb

Charge customers for their shipping fee

2014-09-10 14:01:36 +10:00

enterprises_controller.rb

Remove old landing page cruft

2014-07-17 14:26:07 +10:00

groups_controller.rb

Temporary fix to get staging working

2014-06-20 13:51:21 +10:00

home_controller.rb

Minor refactoring from code review with Rohan

2014-06-19 11:41:24 +10:00

map_controller.rb

Minor refactoring from code review with Rohan

2014-06-19 11:41:24 +10:00

producers_controller.rb

Minor refactoring from code review with Rohan

2014-06-19 11:41:24 +10:00

registration_controller.rb

Remove unrequired store registration action

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

shop_controller.rb

Uncaching some parts and adding specs

2014-07-10 14:49:21 +10:00

user_passwords_controller.rb

Restoring my clever flash refactoring

2014-06-10 11:14:52 +10:00

user_registrations_controller.rb

Restoring my clever flash refactoring

2014-06-10 11:14:52 +10:00