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

Remove redundant spec line, test that sells is not changed

2015-04-17 15:42:42 +10:00

api

Allowing calls to Api::OrderCyclesController#accessible to specify :as => 'distributor' or 'producer'

2015-05-07 12:50:54 +10:00

spree

Merge branch 'master' into variable_weights

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

base_controller_spec.rb

Show hubs that are not ready for checkout so that we can view SEFH - Sample :/

2014-11-13 15:21:02 +11:00

cart_controller_spec.rb

Alter on_hand counts for products to fix broken specs

2014-03-06 13:14:06 +11:00

checkout_controller_spec.rb

Creating simple_order_cycle instead of order_cycle

2014-11-28 12:29:47 +11:00

enterprise_confirmations_controller_spec.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_spec.rb

Moving permalink check action to enterprise controller

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

groups_controller_spec.rb

Dereferencing groups and adding modals to page

2014-06-24 17:15:31 +10:00

home_controller_spec.rb

Show hubs that are not ready for checkout so that we can view SEFH - Sample :/

2014-11-13 15:21:02 +11:00

map_controller_spec.rb

Show hubs that are not ready for checkout so that we can view SEFH - Sample :/

2014-11-13 15:21:02 +11:00

producers_controller_spec.rb

Show hubs that are not ready for checkout so that we can view SEFH - Sample :/

2014-11-13 15:21:02 +11:00

registration_controller_spec.rb

Remove unrequired store registration action

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

shop_controller_spec.rb

Making spec controller product request spec a little bit more robust

2015-01-22 10:20:03 +11:00

user_passwords_controller_spec.rb

Run password reset job for spec that requires it

2015-04-22 07:32:22 +10:00

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