Commit graph

109 commits

Author SHA1 Message Date
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
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
James Allen
9fd099c24f Update getDoc signature to match reality 2017-01-16 17:09:44 +01:00
James Allen
f66d631886 Merge branch 'master' into ja-track-changes 2017-01-13 13:40:42 +01:00
Brian Gough
e5160d9a36 log client id when disconnecting on otUpdateError
only log errors for connected clients
2016-12-16 14:43:51 +00:00
James Allen
bf2620ee0c Return ranges from docupdater to client 2016-12-08 11:37:31 +00:00
James Allen
5d377713d6 Try to fix issue with acceptance tests timing out 2016-12-08 11:25:25 +00:00
James Allen
7bade0a8bb Merge branch 'master' of github.com:sharelatex/real-time-sharelatex 2016-12-08 11:16:22 +00:00
James Allen
9cf0eb5540 Add in acceptance test script 2016-12-08 11:14:27 +00:00
James Allen
4cff89becc Fix acceptance tests 2016-12-08 11:12:07 +00:00
James Allen
81b4401c47 Merge pull request #8 from sharelatex/sk-sessions-cluster
Sk sessions cluster
2016-11-18 14:27:24 +00:00
Shane Kilkelly
de18231ef1 clarify purpose of redis client 2016-11-09 12:09:15 +00:00
Shane Kilkelly
41868ddda3 Make real-time work with web sessions in redis-cluster 2016-11-09 12:06:32 +00:00
Brian Gough
02194f7f86 Merge pull request #7 from sharelatex/bg-add-authentication-events-on-connect
send connectionAccepted/Rejected events on connect
2016-11-01 11:25:15 +00:00
Brian Gough
2e0f5b74db send connectionAccepted/Rejected events on connect
let the client know whether it has successfully authenticated
2016-10-28 15:41:57 +01:00
James Allen
5f8b4d6a0a Merge pull request #6 from sharelatex/ja-real-time-reconnects
Add end point to start draining clients
2016-10-26 10:04:40 +01:00
James Allen
6fa2a81baf Make breakout logic after draining N clients more clear 2016-10-24 16:54:56 +01:00
James Allen
7107d9adcd Delete logging that will be noisy in production 2016-10-24 16:40:10 +01:00
James Allen
59d042e264 Add end point to start draining clients 2016-10-24 16:36:09 +01:00
Shane Kilkelly
185bc7e635 Update session code 2016-09-07 08:58:35 +01:00
Brian Gough
8ffec68250 add comment about fallback case 2016-09-05 12:46:52 +01:00
Brian Gough
ef85bce3b8 track permissions when clients join and leave docs 2016-09-05 12:46:52 +01:00
Brian Gough
9ab19c5d03 avoid double callback 2016-09-02 16:34:14 +01:00
James Allen
51939512ac Return semantic error if doc ops range is not loaded 2016-05-31 14:21:23 +01:00