Rohan Mitchell 4491d3cc73 Merge branch 'legacy-login-fix' of https://github.com/victornava/openfoodnetwork into victornava-legacy-login-fix ...

Conflicts:
	app/views/admin/order_cycles/_row.html.haml
	spec/features/admin/order_cycles_spec.rb

2015-03-16 12:14:54 +11:00

..

admin

Merge branch 'legacy-login-fix' of https://github.com/victornava/openfoodnetwork into victornava-legacy-login-fix

2015-03-16 12:14:54 +11:00

api

enterprise routes use permalink

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

open_food_network

Make unused cart_controller happy

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

spree

Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2

2015-03-12 12:15:22 +11:00

application_controller.rb

Fix specs: Distributors require shipping and payment method

2014-11-01 10:42:38 +11:00

base_controller.rb

Finally got all callbacks available to all action that need them

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

checkout_controller.rb

When user has selected a hub that is not ready for checkout, unselect it

2014-10-31 15:02:58 +11:00

enterprise_confirmations_controller.rb

Enterprise confirmation emails can be resent, and sensible things happen if confirmation link is clicked twice

2014-11-06 21:19:21 +11:00

enterprises_controller.rb

Fix before_filter load order for enterprises#shop

2015-02-12 11:34:58 +11:00

groups_controller.rb

first draft of group page, a lot of TODOs

2015-01-06 22:39:15 +11: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

Finally got all callbacks available to all action that need them

2015-01-22 10:19:46 +11: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