Rohan Mitchell a207f50aeb Merge branch 'master' into delay-devise-emails ...

Conflicts:
	script/run_tests.sh

2015-04-30 12:29:06 +10:00

..

archive/features/consumer

…

controllers

Run password reset job for spec that requires it

2015-04-22 07:32:22 +10:00

features

Merge branch 'master' into delay-devise-emails

2015-04-30 12:29:06 +10:00

helpers

Add helper to display total tax on an order

2015-04-17 13:39:09 +10:00

javascripts

Updating product model specs to reflect changes to properties

2015-04-23 15:37:41 +10:00

jobs

…

lib

…

mailers

…

models

Merge branch 'master' into delay-devise-emails

2015-04-30 12:29:06 +10:00

requests

…

serializers

Moving spree namespaced serializers into admin

2015-04-22 21:02:06 +10:00

support

Add save_and_open spec helper method to open HTML emails in the browser

2015-04-17 13:40:08 +10:00

views/json

…

factories.rb

Deliver a warning if attempting to create an invalid taxed_product from factory

2015-04-17 13:39:09 +10:00

spec_helper.rb

Allow more time for phantomjs, required by first admin spec where assets are compiled

2015-04-17 15:46:51 +10:00