12 commits

Author	SHA1	Message	Date
James Allen	24dd89bc38	Adjust wording	2017-10-09 14:23:05 +01:00
James Allen	8c9ad69dfe	Always npm install translations from master	2017-10-09 14:22:04 +01:00
James Allen	afe40809ad	Add in account merge module to build step	2017-10-04 14:57:08 +01:00
Joe Green	3c9c94f3c2	release number (#32) ... Replace release number in pug template for sentry	2017-09-29 10:37:39 +01:00
James Allen	ffc35d9d65	Include docker command directly because node isn't available in Jenkins	2017-09-27 10:50:34 +02:00
James Allen	1502da85cf	Set up acceptance tests to run in docker container	2017-09-27 10:37:20 +02:00
James Allen	d0ce22b0f8	Add in overleaf-integration module to build	2017-09-18 11:30:43 +02:00
James Allen	a0ac11eb0d	Actually push to master branch	2017-09-18 11:11:33 +02:00
James Allen	f0092bc85a	Push master branch to public repo after successful build ... Note that this has to happen outside of the docker container to work around issues with git and user ids, so we've had to modify the pipeline to explicitly run the steps inside docker as needed.	2017-09-18 11:10:22 +02:00
Joe Green	404749acaf	disableConcurrentBuilds	2017-09-04 16:02:16 +01:00
Joe Green	144a13462e	build.txt	2017-09-04 14:58:13 +01:00
Joe Green	d184c9c555	Add Jenkinsfile ... * added Jenkins file * Use new build process * comment out post stage * use checkout step * install grunt before unit tests * swap hardcoded config for env vars	2017-08-16 10:43:48 +01:00