5 Commits

Author	SHA1	Message	Date
Leo Hemsted	7835339165	Merge branch 'master' into test-fixes	2016-08-26 10:57:41 +01:00
bandesz	135ac6f23e	Rename development env to preview	2016-08-24 15:55:29 +01:00
bandesz	f113309713	Fix version file generation, remove master deploys from travis	2016-08-23 13:44:34 +01:00
Leo Hemsted	a3843053cd	improved local test-running ability ... call generate-version-file before tests, since they'll fall over if the version file isn't present use /Users/leohemsted/.virtualenvs/api rather than looking for ./venv/ - if there's some other venv already active, then don't try and look for a current venv to activate	2016-08-23 12:17:56 +01:00
bandesz	68c1135379	Create Docker build image, build project with Docker	2016-08-22 17:25:41 +01:00