Rohan Mitchell dd97768947 Merge branch 'move-save-checkout-button' ...

Conflicts:
	spec/features/consumer/checkout_spec.rb

2013-07-23 17:03:00 +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

Disable order cycles in the front end by default.

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

checkout_spec.rb

Merge branch 'move-save-checkout-button'

2013-07-23 17:03:00 +10:00

cms_spec.rb

Upgrade capybara, spec/requests changed to spec/features

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

distributors_spec.rb

Move distributor/OC browsing into its own acceptance spec

2013-03-27 11:58:38 +11: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

Upgrade capybara, spec/requests changed to spec/features

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

taxonomy_spec.rb

Disable order cycles in the front end by default.

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