Rohan Mitchell 952353da8c Merge branch 'bulk-product-edit' into combined/single-order-patches-and-bulk-product-edit ...

Conflicts:
	spec/features/admin/bulk_product_update_spec.rb

2015-05-29 15:08:30 +10:00

..

archive/features/consumer

Special Instructions in checkout are actually wired up

2014-09-06 12:00:27 +10:00

controllers

Merge branch 'master' into require_standard_variant

2015-05-28 15:08:13 +10:00

features

Merge branch 'bulk-product-edit' into combined/single-order-patches-and-bulk-product-edit

2015-05-29 15:08:30 +10:00

helpers

Add helper to display total tax on an order

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

javascripts

Merge branch 'bulk-product-edit' into combined/single-order-patches-and-bulk-product-edit

2015-05-29 15:08:30 +10:00

jobs

Add jobs for user, order and enterprise emails

2015-04-16 16:54:43 +10:00

lib

Merge branch 'master' into require_standard_variant

2015-05-28 15:08:13 +10:00

mailers

Adding a ship address to order in spec

2015-03-01 12:22:06 +11:00

models

Auto-merge from CI [skip ci]

2015-05-29 14:29:23 +10:00

requests

Fixing broken specs

2015-04-17 13:00:20 +10:00

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

Removing stupid unusable spec

2015-04-09 17:20:31 +10:00

factories.rb

Auto-merge from CI [skip ci]

2015-05-29 14:29:23 +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