Commit graph

337 commits

Author SHA1 Message Date
Henry Oswald
37ef1ba816 add empty env block 2018-05-23 11:35:30 +01:00
Henry Oswald
c1947c5cbd dockerise app, 1.1.3 build scripts 2018-05-23 11:27:31 +01:00
Shane Kilkelly
cdfc6b6131 Merge pull request #30 from sharelatex/sk-upgrade-node-8
Upgrade NodeJS to version 6
2018-04-26 10:53:07 +01:00
Shane Kilkelly
0433692aec remove package-lock file 2018-04-26 10:34:05 +01:00
Shane Kilkelly
f0495d8ec6 Change to Node 6 2018-04-26 10:24:59 +01:00
Alberto Fernández-Capel
71256b58d2 Merge pull request #31 from sharelatex/afc-fix-travisci-build
Do not specify the node version in .travis.yml
2018-04-23 10:51:34 +01:00
Alberto Fernández Capel
6757f70daa Do not specify the node version in .travis.yml
So travis picks it from .nvmrc
2018-04-19 14:08:41 +01:00
Shane Kilkelly
dd7386bb54 Upgrade NodeJS to version 8 2018-04-16 14:44:59 +01:00
James Allen
a47894636b Merge pull request #29 from sharelatex/ja-dockerize-dev
Provide hosts as environment settings and add npm run start script
2018-01-16 17:08:23 +00:00
James Allen
f06bd26572 Add coffee script dependency 2017-12-29 10:35:40 +00:00
James Allen
a4cc02dbc3 Provide hosts as environment settings and add npm run start script 2017-12-29 08:12:31 +00:00
Joe Green
c864cd24bf Update Jenkinsfile 2017-10-16 14:09:54 +01:00
Joe Green
80eb7a8eda alert only on master 2017-10-12 17:07:29 +01:00
James Allen
8f71dcf113 Merge pull request #28 from sharelatex/ja-quieten-logs
Remove another verbose log object
2017-09-20 09:56:01 +02:00
James Allen
d86a964081 Remove another verbose log object 2017-09-20 09:52:28 +02:00
James Allen
122a0628d9 Merge pull request #27 from sharelatex/ja-quieten-logs
Don't log out doc lines and ranges
2017-09-20 09:49:55 +02:00
James Allen
05a1939547 Don't log out doc lines and ranges 2017-09-20 09:42:08 +02:00
Joe Green
a0e33ae1e8 added build.txt 2017-09-04 14:48:21 +01:00
Shane Kilkelly
3cb59f365f Merge pull request #26 from sharelatex/sk-upgrade-mongojs
Upgrade mongojs dependency to version 2.4.0
2017-08-29 10:27:17 +01:00
Shane Kilkelly
65697cb2f6 Upgrade sinonjs, and fix unit tests.
- use `sinon.match.has` for error matching
- restore previous use of `calledWith`
2017-08-22 15:20:43 +01:00
Shane Kilkelly
1f3b0a3713 Upgrade mongojs dependency to version 2.4.0
- Upgrade in package.json
- Use new connection syntax
- Fix unit tests, issues with object equality
2017-08-22 08:26:30 +01:00
Joe Green
d90798008b Create Jenkinsfile
Create Jenkinsfile
2017-08-16 10:19:31 +01:00
Joe Green
172060c066 Use correct env vars 2017-08-14 15:44:40 +01:00
Joe Green
26ab98f04a run acceptance tests 2017-08-14 15:34:34 +01:00
Joe Green
ca42638ab3 Create Jenkinsfile 2017-08-11 11:09:41 +01:00
Brian Gough
abe90cad10 Revert "Merge pull request #23 from sharelatex/bg-optimise-get-all-docs"
This reverts commit c1337cf23f37bd9ba48419accf1f54c00390e0ea, reversing
changes made to fbb2fa15bf4239db006db742f906554d61a0eac4.
2017-06-30 14:54:11 +01:00
Brian Gough
36252fb5b7 Merge pull request #23 from sharelatex/bg-optimise-get-all-docs
optimise get all docs
2017-06-30 11:09:23 +01:00
Brian Gough
a2ac37ac99 comments about optimistic loading 2017-06-28 10:06:50 +01:00
Brian Gough
b9b0596d83 optimistically load all docs 2017-06-27 16:58:20 +01:00
James Allen
e10d09d040 Merge pull request #22 from sharelatex/ja-archive-ranges
Archive ranges as well as doc lines
2017-05-17 12:02:42 +01:00
Shane Kilkelly
6a6fdc13a5 Merge branch 'sk-upgrade-metrics' 2017-04-04 09:34:45 +01:00
James Allen
7a64f040f1 Test and fix _mongoDocToS3Doc 2017-04-03 16:04:54 +01:00
James Allen
bf187f30ec Add tests for _s3DocToMongo 2017-04-03 15:50:33 +01:00
Shane Kilkelly
b14039715f Stub out logger in tests 2017-03-31 11:25:23 +01:00
Shane Kilkelly
f7bc400f22 upgrade to most recent metrics 2017-03-31 11:18:31 +01:00
Shane Kilkelly
62e3cb41a2 Merge branch 'master' of github.com:sharelatex/docstore-sharelatex 2017-03-31 11:03:26 +01:00
James Allen
f94e33a3a9 Merge branch 'master' into ja-archive-ranges
Conflicts:
	app/coffee/DocArchiveManager.coffee
	test/acceptance/coffee/ArchiveDocsTests.coffee
2017-03-30 17:19:42 +01:00
James Allen
a9ab7b739d Archive ranges as well as doc lines 2017-03-30 17:13:43 +01:00
Henry Oswald
e231f8d367 Merge pull request #20 from sharelatex/ho-delete-doc-id-true
safely always get inS3 to unarchive automatically
2017-03-27 12:02:07 +01:00
Shane Kilkelly
ce01b39967 Update metrics version to 1.7.0 2017-03-21 13:48:21 +00:00
Shane Kilkelly
60393ac44f Merge branch 'master' into sk-upgrade-metrics 2017-03-20 09:45:50 +00:00
Shane Kilkelly
e3ca46705c Merge branch 'master' of github.com:sharelatex/docstore-sharelatex 2017-03-20 09:45:42 +00:00
Henry Oswald
8b02ba95b6 add missing error handler 2017-03-17 15:58:01 +00:00
Shane Kilkelly
bc37c844ea update to new metrics api 2017-03-17 15:27:36 +00:00
Shane Kilkelly
e879f9c742 Upgrade metrics 2017-03-16 16:46:58 +00:00
Henry Oswald
c0e23df82b break getDoc into multiple helpers, stop passing filters though from other calls 2017-03-15 22:09:56 +00:00
Henry Oswald
ffd1aa0ca4 just get doc_id for quick check to see if it exists 2017-03-10 11:45:03 +00:00
Henry Oswald
7adc67d13a add missing error handler 2017-03-10 10:37:11 +00:00
Henry Oswald
c2b96c7e1e Merge pull request #17 from sharelatex/ho-always-check-s3
Always get inS3 when getting doc
2017-03-10 10:36:59 +00:00
Henry Oswald
f067c039fe always search for inS3 when getting a doc 2017-03-09 18:51:54 +00:00