Will Marshall 20d7484134 Merge branch 'master' into laura_and_will ...

Conflicts:
	app/assets/javascripts/darkswarm/services/order.js.coffee

2014-07-28 13:43:31 +10:00

..

admin

Initialise enterprise country in controller, not model. Fixes address SQL load every time an enterprise is instanciated.

2014-07-04 14:39:27 +10:00

api

Authorise access to OrderCycles API

2014-04-24 13:20:16 +10:00

open_food_network

Rename OpenFoodWeb namespace to OpenFoodNetwork

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

spree

Merge branch 'master' into laura_and_will

2014-07-28 13:43:31 +10: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

Fix redirect to paypal for better spree paypal express

2014-07-25 12:44:14 +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

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