Will Marshall f7c71568df Merge branch 'laura_and_will' ...

Conflicts:
	app/models/spree/variant_decorator.rb
	db/schema.rb
	spec/models/spree/product_spec.rb
	spec/models/spree/variant_spec.rb

2014-06-13 12:42:14 +10:00

..

ability_spec.rb

Enterprise user can manage enterprise relationships

2014-05-22 10:54:51 +10:00

addresses_spec.rb

Adding some spec tweaks

2014-02-21 15:17:18 +11:00

adjustment_spec.rb

Move spree model decorator specs into their own dir to mirror model dir layout

2013-10-17 09:53:54 +11:00

classification_spec.rb

Adding primary taxon field to product

2014-05-30 14:31:03 +10:00

line_item_spec.rb

LineItem.supplied_by_any

2014-06-06 09:47:15 +10:00

order_populator_spec.rb

Removing redundant functionality from the Order Populator

2014-01-08 14:45:40 +11:00

order_spec.rb

Removing payments when emptying order

2014-06-10 11:15:04 +10:00

payment_method_spec.rb

Sort payment methods by name

2013-11-21 14:42:28 +11:00

product_spec.rb

Reworking the variant display of units and names

2014-06-12 16:13:51 +10:00

shipping_method_spec.rb

Restoring the old checkout, but NOW our new checkout is broken

2014-03-06 16:16:00 +11:00

user_spec.rb

Adding a signup confirmation email

2014-04-04 12:36:33 +13:00

variant_spec.rb

Reworking the variant display of units and names

2014-06-12 16:13:51 +10:00