Commit graph

597 commits

Author SHA1 Message Date
Brian Gough
79c1dc5c1a use explicit json content-type to avoid security issues with text/html 2019-02-07 15:54:13 +00:00
Henry Oswald
01d3f4bff4 Merge pull request #54 from sharelatex/ho-docker
Update docker build process
2019-02-06 13:42:03 +00:00
Henry Oswald
0151826eaf clear error if s3 keys are not set for tests 2019-02-06 12:23:15 +00:00
Henry Oswald
7caf3d4935 remove debugging 2019-02-06 11:29:31 +00:00
Henry Oswald
cef7e1e17b Merge branch 'master' into ho-docker 2019-02-06 11:28:16 +00:00
Henry Oswald
6a3506aed9 update redis key schema for cluster 2019-02-01 19:42:14 +00:00
Henry Oswald
38dbea4b0e bulk upgrade to 1.1.12, moved to npm rather than git 2019-02-01 16:18:23 +00:00
Brian Gough
0b5f0bef52 Merge pull request #52 from sharelatex/bg-add-coffeescript-to-package-json
add missing coffeescript to package.json
2019-01-14 10:58:33 +00:00
Brian Gough
d4a22a65ac add missing coffeescript to package.json
using the same version as in web
2019-01-14 08:43:11 +00:00
Brian Gough
cf5a78c7d7 Merge pull request #51 from sharelatex/bg-remove-unwanted-modules
remove unnecessary modules
2019-01-14 08:35:46 +00:00
Christopher Hoskin
d9c95f40d3 Merge pull request #53 from sharelatex/csh-ho-docker-issue-1338-bulk-upgrade
Services bulk upgrade - track-changes
2019-01-12 07:19:54 +00:00
Christopher Hoskin
44762ef498 Add **/*.map to .gitignore 2019-01-11 19:09:39 +00:00
Christopher Hoskin
cc4d9ffcbc Bump buildscript to 1.1.11 2019-01-11 19:07:06 +00:00
Christopher Hoskin
5e1d51d5d7 Add note on acceptance tests to README.md 2019-01-11 19:04:35 +00:00
Christopher Hoskin
86c202af8e Merge branch 'bg-remove-unwanted-modules' into csh-ho-docker-issue-1338-bulk-upgrade 2019-01-11 17:53:48 +00:00
Brian Gough
def7a0eeaa remove unnecessary modules 2019-01-11 15:17:18 +00:00
Christopher Hoskin
fe4c75a2ab Remove grunt 2019-01-08 16:39:46 +00:00
Christopher Hoskin
1c701a2d3d Bump buildscript to v1.1.10 2019-01-08 16:15:04 +00:00
Christopher Hoskin
65e1aba265 Update app.coffee to work with Metrics v2 2019-01-08 16:11:56 +00:00
Christopher Hoskin
85216fbd34 Update metrics to v2.0.12, logger to v1.5.9 and settings to v1.1.0, add npm-shrinkwrap 2019-01-08 16:08:40 +00:00
Henry Oswald
d88a40e383 Merge branch 'master' into ho-docker 2018-12-05 16:50:41 +00:00
Henry Oswald
0529493168 bump metrics 2018-12-05 16:50:20 +00:00
Henry Oswald
c3ec4a534e update config to take DOCUMENT_UPDATER_HOST 2018-12-05 16:49:15 +00:00
Alasdair Smith
8ade2841ff Merge pull request #50 from sharelatex/as-fix-no-sl
Switch dev env to use v2 port instead of SL
2018-10-10 10:11:07 +01:00
Alasdair Smith
a2ff9de0dd Use setting instead of hard-coding port 2018-10-09 11:51:18 +01:00
Henry Oswald
8d8319460e pass tmp path as env var 2018-10-04 11:14:15 +01:00
Henry Oswald
7893ace13f add aws creds 2018-10-04 10:40:34 +01:00
Henry Oswald
0a64983fb4 update config with full mongo conneciton and redis details 2018-10-04 10:34:44 +01:00
Henry Oswald
f811b70b67 Merge branch 'ho-docker' of github.com:sharelatex/track-changes-sharelatex into ho-docker 2018-10-04 10:33:41 +01:00
Henry Oswald
f26bebca4d update build scripts 2018-10-04 10:32:21 +01:00
Christopher Hoskin
a6ab549d29 Update build_scripts to 1.1.4 (draft) 2018-05-29 15:39:52 +01:00
Henry Oswald
fca95b5b27 dockerise app
- 1.1.3 build scripts
- add env vars for configuring s3
- add docker file
2018-05-24 12:02:27 +01:00
Alberto Fernández-Capel
97566a6dc9 Merge pull request #48 from sharelatex/afc-fix-travis-build
Make travis read node version from .nvmrc file
2018-05-01 09:46:19 +01:00
Alberto Fernández Capel
3de7970e0b Make travis read node version from .nvmrc file 2018-05-01 09:21:20 +01:00
James Allen
c420916c17 Merge pull request #47 from sharelatex/ja-dockerize-dev
Provide hosts as environment settings and add npm run start script
2018-01-16 17:09:07 +00:00
James Allen
dd008e1c7d Provide hosts as environment settings and add npm run start script 2017-12-29 08:18:04 +00:00
Brian Gough
412e67f119 Merge pull request #46 from sharelatex/bg-upgrade-ioredis
upgrade to ioredis 3 via redis-sharelatex
2017-10-30 11:20:15 +00:00
Brian Gough
b9adad72be upgrade to ioredis 3 via redis-sharelatex 2017-10-30 11:09:25 +00:00
Brian Gough
dacc7ebabb exit if mock servers fail to start 2017-10-20 15:24:58 +01:00
Joe Green
67be2feb23 Update Jenkinsfile 2017-10-16 14:13:00 +01:00
Joe Green
90f2b85034 only alert on master 2017-10-12 16:57:06 +01:00
Joe Green
dbef5904be use correct node version in jenkinsfile 2017-09-20 15:46:48 +01:00
Joe Green
76cae1acf4 build.txt 2017-09-04 14:57:36 +01:00
Shane Kilkelly
b959e33b4b Merge pull request #44 from sharelatex/sk-node-6
Upgrade to Node6
2017-08-31 09:51:07 +01:00
Shane Kilkelly
1d0e0e68aa Merge branch 'master' into sk-node-6 2017-08-30 08:33:46 +01:00
Brian Gough
9dafaea64b Merge pull request #45 from sharelatex/bg-fix-broken-unit-test
fix broken unit test
2017-08-29 15:52:46 +01:00
Brian Gough
ca991c1efd fix broken unit test
the behaviour of the code changed so that raw ops are always compressed
2017-08-29 15:10:58 +01:00
Shane Kilkelly
1cd80b9dcd Restore a broken test that was commented out temporarily 2017-08-25 14:53:39 +01:00
Shane Kilkelly
ad43ddb6c6 Remove commented-out code 2017-08-25 14:52:14 +01:00
Shane Kilkelly
f6fdc5a827 Remove stray log 2017-08-25 14:50:33 +01:00