Rob Harrington 903ed7e507 Merge branch 'master' into variable_weights ...

Conflicts:
	app/assets/javascripts/admin/bulk_order_management.js.coffee
	app/views/spree/admin/orders/bulk_management.html.haml
	app/views/spree/api/line_items/bulk_show.v1.rabl
	spec/features/admin/bulk_order_management_spec.rb

2015-05-21 17:31:33 +10:00

..

admin

Fix bug where new enterprises should be created as hubs, but aren't

2015-04-16 10:59:15 +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 'master' into variable_weights

2015-05-21 17:31:33 +10:00

application_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

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

Adding bugsnag notify block for catching naughty phantom fees

2015-04-10 16:41:10 +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

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

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