Rohan Mitchell 0431e0048c Merge branch 'master' into variant-overrides-frontend ...

Conflicts:
	app/controllers/shop_controller.rb
	app/views/shop/products/_form.html.haml
	spec/controllers/shop_controller_spec.rb

2015-01-12 16:48:51 +11:00

..

admin

Errors on bulk update for enterprise index do not allow user to list all enterprises

2014-11-06 11:01:44 +11:00

api

Using simple_order_cycle

2014-11-28 13:55:06 +11:00

spree

Redirecting any spree checkout_state redirects to our checkout controller

2014-12-11 14:53:11 +11: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

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

Fix specs: Distributors require shipping and payment method

2014-11-01 10:42:38 +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

Merge branch 'master' into variant-overrides-frontend

2015-01-12 16:48:51 +11:00

user_passwords_controller_spec.rb

Switching our recover password form to Darkswarm

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

user_registrations_controller_spec.rb

Adding our own user registrations controller, reworking sidebar a touch

2014-03-21 15:18:27 +11:00