Rohan Mitchell 7640eb497a Merge branch 'supplied-active-products-on-hand' ...

Conflicts:
	app/controllers/application_controller.rb
	app/models/enterprise.rb
	app/views/spree/products/_source_sidebar.html.haml
	spec/features/consumer/distributors_spec.rb
	spec/models/enterprises_spec.rb

2013-07-29 11:05:42 +10:00

..

add_to_cart_spec.rb

Disable order cycles in the front end by default.

2013-07-22 17:16:55 +10:00

browse_products_spec.rb

Merge branch 'supplied-active-products-on-hand'

2013-07-29 11:05:42 +10:00

checkout_spec.rb

Fix test regressions with multiple 'Save and Continue' buttons in checkout

2013-07-23 17:48:54 +10:00

cms_spec.rb

Upgrade capybara, spec/requests changed to spec/features

2013-01-15 10:10:24 +11:00

distributors_spec.rb

Merge branch 'supplied-active-products-on-hand'

2013-07-29 11:05:42 +10:00

order_cycles_spec.rb

Disable order cycles in the front end by default.

2013-07-22 17:16:55 +10:00

product_spec.rb

Display order cycle distributors on product details page

2013-04-12 13:18:40 +10:00

suppliers_spec.rb

Remove speculative test

2013-07-29 09:47:28 +10:00

taxonomy_spec.rb

Disable order cycles in the front end by default.

2013-07-22 17:16:55 +10:00