Rob Harrington be8038e9d0 Merge branch 'master' into line_item_naming ...

Conflicts:
	lib/open_food_network/order_cycle_management_report.rb
	lib/open_food_network/packing_report.rb

2015-11-12 14:40:11 +11:00

..

admin

Merge branch 'master' into line_item_naming

2015-11-12 14:40:11 +11:00

api

Wrapping line_item update with order.update_distribution_charge inside lock

2015-10-28 13:08:50 +11:00

checkout_controller_decorator.rb

Redirecting any spree checkout_state redirects to our checkout controller

2014-12-11 14:53:11 +11:00

orders_controller_decorator.rb

Removing obsolete methods

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

paypal_controller_decorator.rb

Call reset order callback when order completed via paypal

2014-07-25 12:44:14 +10:00

store_controller_decorator.rb

Adding our own custom unauthorized page

2014-05-30 11:24:37 +10:00

user_sessions_controller_decorator.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

users_controller_decorator.rb

Moving User Account to darkswarm

2014-03-28 16:02:32 +11:00