Rohan Mitchell eac22df200 Merge branch 'master' into redesign ...

Conflicts:
	app/assets/javascripts/templates/product_modal.html.haml

2015-05-13 09:53:20 +10:00

..

archive/features/consumer

Special Instructions in checkout are actually wired up

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

controllers

Merge remote-tracking branch 'origin/master' into single-order-patches

2015-04-30 17:18:02 +10:00

features

Merge branch 'master' into redesign

2015-05-13 09:53:20 +10:00

helpers

Add helper to display total tax on an order

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

javascripts

Brand story can be expanded and contracted

2015-05-06 14:54:16 +10:00

jobs

Add jobs for user, order and enterprise emails

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

lib

Renaming order_cycle_exchanges as visible_exchanges

2015-04-11 22:26:55 +10:00

mailers

Adding a ship address to order in spec

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

models

Merge branch 'master' into pin-refunds

2015-05-01 14:58:19 +10:00

requests

Fix specs: feature specs requiring payment and shipping methods, race condition, double flash message issue

2014-11-01 12:11:50 +11: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

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