Rohan Mitchell d908701b59 Merge branch 'master' into folklabs-producer-emails ...

Conflicts:
	Gemfile

2015-06-11 17:02:34 +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 folklabs-producer-emails

2015-06-11 17:02:34 +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

Convention

2015-04-29 15:56:27 +10:00

lib

Merge branch 'master' into folklabs-producer-emails

2015-06-11 17:02:34 +10:00

mailers

#275: Code cleanup.

2015-05-24 10:44:39 +01:00

models

Merge branch 'master' into folklabs-producer-emails

2015-06-11 17:02:34 +10:00

performance

Do not run performance specs in CI

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

requests

scoping down large request spec

2015-06-10 13:50:55 +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 folklabs-producer-emails

2015-06-11 17:02:34 +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