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

..

archive/features/consumer

Set increased Capybara.default_wait_time globally

2014-05-02 14:25:32 +10:00

controllers

Add product soft-delete API action

2014-06-12 14:59:26 +10:00

features

Merge branch 'laura_and_will'

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

helpers

Starting on on the map

2014-06-06 14:04:45 +10:00

javascripts

BPE uses soft-delete for products

2014-06-12 14:59:27 +10:00

lib

OptionValueNamer spec refactor

2014-06-12 12:57:20 +10:00

mailers

Fixing the build! Some minor bugs due to mailer changes

2014-04-09 12:19:52 +10:00

models

Merge branch 'laura_and_will'

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

requests

Adding our first request spec

2014-05-05 12:10:14 +10:00

support

Fix payments coming up as $0, credit card charges failing for the same reason

2014-06-12 11:49:54 +10:00

views

Fix timing error in enterprise supplied products rabl spec

2014-06-12 15:21:35 +10:00

factories.rb

Adding primary taxon field to product

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

spec_helper.rb

Tidy up spec helper, clean database before suite run

2014-05-22 11:00:29 +10:00