Rohan Mitchell 7412e92665 Merge branch 'master' into optimise-shopfront

2015-06-10 16:39:02 +10:00

..

archive/features/consumer

Special Instructions in checkout are actually wired up

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

controllers

add spec_helper to customers_controller_spec

2015-06-05 14:25:45 +10:00

features

Merge remote-tracking branch 'origin/xero-report' into combined/xero-report_show-order-without-distributor

2015-06-05 13:48:24 +10:00

helpers

Decouple generic injection spec from EnterpriseSerializer

2015-06-03 12:53:46 +10:00

javascripts

Fixing customers controller spec

2015-06-03 15:23:55 +08:00

jobs

Add jobs for user, order and enterprise emails

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

lib

Merge branch 'master' into optimise-shopfront

2015-06-10 16:39:02 +10:00

mailers

Adding a ship address to order in spec

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

models

Merge branch 'master' into optimise-shopfront

2015-06-10 16:39:02 +10:00

performance

Do not run performance specs in CI

2015-06-03 13:00:07 +10:00

requests

Fixing broken specs

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

serializers

Serialize taxons and relatives in expected format

2015-05-29 14:03:44 +10:00

support

Merge remote-tracking branch 'origin/xero-report' into combined/xero-report_show-order-without-distributor

2015-06-05 13:48:24 +10:00

views/json

Removing stupid unusable spec

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

factories.rb

Merge branch 'master' into customers

2015-06-03 15:19:40 +08: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