Commit graph

131 commits

Author SHA1 Message Date
Brian Gough
17ac7719c3 Merge pull request #23 from sharelatex/bg-upgrade-ioredis
upgrade ioredis
2017-10-30 14:06:18 +00:00
Brian Gough
16de6dcf2a Merge pull request #22 from sharelatex/bg-upgrade-to-node-6
upgrade to node 6
2017-10-30 14:05:48 +00:00
Brian Gough
0568aada17 upgrade to node 6 2017-10-30 13:46:37 +00:00
Brian Gough
cc118fa230 remove unnecessary ioredis package 2017-10-30 13:44:09 +00:00
Brian Gough
510ee6bf4f use ioredis 3 via redis-sharelatex 2017-10-30 13:43:36 +00:00
Brian Gough
ee2bdfb61c Merge pull request #21 from sharelatex/bg-fix-listen-in-acceptance-tests
exit if mock servers fail to start
2017-10-25 09:14:09 +01:00
Brian Gough
168d646328 exit if mock servers fail to start 2017-10-20 15:19:20 +01:00
Joe Green
acc0193211 Update Jenkinsfile 2017-10-16 14:13:20 +01:00
Joe Green
ce2238c5d8 only alert on master 2017-10-12 16:56:13 +01:00
Alasdair Smith
c1b5e1d04c Merge pull request #19 from sharelatex/as-fix-tests
Fix joinDoc tests & add encoding tests
2017-09-22 11:09:33 +01:00
Alasdair Smith
6470577c3f Add acceptance tests for joinDoc variadic 2017-09-22 11:01:11 +01:00
Alasdair Smith
785d6e2eea Add tests for comment & change encoding 2017-09-22 10:56:08 +01:00
Alasdair Smith
b8d3f34e54 Fix joinDoc tests not passing options arg and restructure tests 2017-09-22 10:56:08 +01:00
Alasdair Smith
ed252db25e Merge pull request #18 from sharelatex/as-encode-ranges
Encoding changes & comments in ranges
2017-09-22 09:48:42 +01:00
Alasdair Smith
a0505afb23 Be defensive on comment text 2017-09-22 09:34:10 +01:00
Alasdair Smith
c67150ea10 Ensure falsy value doesn't fail conditional 2017-09-22 09:33:29 +01:00
Alasdair Smith
937bf82a2f Return callback with guard 2017-09-22 09:25:24 +01:00
Alasdair Smith
5d8e201732 Don't return obj 2017-09-21 16:58:03 +01:00
Alasdair Smith
a299d7335d Fix incorrect var 2017-09-21 16:56:18 +01:00
Alasdair Smith
90d05dc6dd Make args order consistent 2017-09-21 16:56:09 +01:00
Alasdair Smith
3966e2f85b Make variadic options more explicit 2017-09-21 16:55:49 +01:00
Alasdair Smith
790b9ea8ed Switch order of args 2017-09-21 15:19:19 +01:00
Alasdair Smith
55c880e1dd DRY up a bit 2017-09-21 15:07:15 +01:00
Alasdair Smith
b796879c9f Handle options not being passed 2017-09-21 14:58:49 +01:00
Alasdair Smith
aa6e0d0d69 Only encode ranges if option passed 2017-09-21 14:23:16 +01:00
Alasdair Smith
9f503f1e9f First pass at encoding changes & comments in ranges 2017-09-21 13:25:55 +01:00
Joe Green
afc51482c1 Merge pull request #17 from sharelatex/jg-realtime-acceptance-tests
realtime acceptance tests
2017-09-21 11:22:32 +01:00
Joe Green
dc8f4ffc2a Update Jenkinsfile 2017-09-21 11:03:07 +01:00
Joe Green
0b41d32cbb Update Jenkinsfile 2017-09-21 10:59:41 +01:00
Joe Green
72ef354206 build.txt 2017-09-04 14:54:05 +01:00
Joe Green
c9b9fb77b6 Create Jenkinsfile 2017-08-16 10:30:25 +01:00
Joe Green
3dae68a4f0 Create Jenkinsfile 2017-08-11 14:24:46 +01:00
Brian Gough
56230dad84 Merge pull request #15 from sharelatex/bg-catch-null-bytes
check for null bytes from JSON.stringify
2017-06-06 09:21:48 +01:00
Brian Gough
ab6fe1d948 check for null bytes from JSON.stringify 2017-06-01 11:27:56 +01:00
James Allen
db824d9730 Merge pull request #14 from sharelatex/ja-dont-return-blank-clients
Don't return a user if there is no entry
2017-05-16 11:14:54 +01:00
James Allen
642134da79 Don't return a user if there is no entry
ioredis returns a blank object, {}, if there is no key with hgetall.
Previously, node-redis returned nil. So we need to check for a blank
object as well as a nil object.
2017-05-16 11:06:05 +01:00
James Allen
5cd5b7e110 Merge pull request #13 from sharelatex/ja-remove-multi-call
Remove multi call to make compatible with redis-cluster
2017-05-12 13:58:07 +01:00
James Allen
a8917b933f Remove multi call to make compatible with redis-cluster 2017-05-11 17:27:28 +01:00
James Allen
01d0b63f2c Update config for websessions 2017-05-10 15:52:35 +01:00
James Allen
b7a07ea1b7 Merge pull request #12 from sharelatex/ja-redis-cluster-refactor
Use new redis-sharelatex with support for cluster
2017-05-10 15:30:41 +01:00
James Allen
d04be1c000 Update redis-sharelatex 2017-05-09 17:09:00 +01:00
James Allen
720f24427a Use new redis-sharelatex with support for cluster 2017-05-02 15:51:17 +01:00
Shane Kilkelly
ed76d57bf8 Add a .nvmrc file 2017-03-27 14:51:46 +01:00
James Allen
d8ff8ba098 Merge pull request #11 from sharelatex/ja-allow-readonly-comments
Allow readonly users to submit comments
2017-03-20 14:25:03 +00:00
James Allen
8766646149 Allow users to send a comment update if they are read-only 2017-03-15 15:45:52 +00:00
James Allen
d939f6cd65 Remove some old logging 2017-03-15 15:45:18 +00:00
Brian Gough
52a8e66b43 Merge pull request #10 from sharelatex/bg-avoid-null-project-id-to-docupdater
handle disconnects of unauthenticated users
2017-02-23 13:55:54 +00:00
Brian Gough
d468f662ac handle disconnects of unauthenticated users 2017-02-23 12:04:36 +00:00
Shane Kilkelly
50930cd7b1 Don't npm rebuild inside container 2017-02-20 10:14:41 +00:00
James Allen
e72504e6ec Merge pull request #9 from sharelatex/ja-track-changes
Return ranges from docupdater to client
2017-01-17 10:06:36 +01:00