Commit graph

288 commits

Author SHA1 Message Date
Paulo Reis
36d16a76e0 Unit test accept changes in the ranges manager. 2017-05-12 14:42:40 +01:00
Paulo Reis
d53266ea2d Update web API stub. 2017-05-11 12:00:34 +01:00
Paulo Reis
5677c7ad9a Update range tracker. 2017-05-11 11:31:19 +01:00
Paulo Reis
f690ef078a Update tests; add new ones for multiple changes. 2017-05-09 16:16:25 +01:00
Paulo Reis
144804e516 Update tests with new methods. 2017-05-08 16:34:17 +01:00
Paulo Reis
d7ac57d054 Use new bulk method. 2017-05-08 16:08:42 +01:00
Paulo Reis
70341e4e80 Add bulk method from range tracker. 2017-05-08 16:08:34 +01:00
Paulo Reis
e96e6d6a29 Remove unused method. 2017-05-05 15:17:19 +01:00
Paulo Reis
9b8a2c3030 Consolidate methods to accept changes. 2017-05-05 15:12:06 +01:00
Paulo Reis
d530ee9501 Add methods to bulk accept changes. 2017-05-04 15:32:54 +01:00
Brian Gough
fe5711ef07 Merge pull request #31 from sharelatex/bg-error-check-on-unlock
add error check on unlock
2017-03-31 09:29:53 +01:00
Brian Gough
5583764d05 fix callback prototype in getLock 2017-03-30 15:31:47 +01:00
Brian Gough
c11618b475 improve unlock error handling 2017-03-30 15:31:34 +01:00
Brian Gough
b2b4bc44df upgrade logger-sharelatex to v1.5.6 2017-03-30 14:16:35 +01:00
Brian Gough
20d27024b6 Merge pull request #30 from sharelatex/bg-log-pushed-ops
log op versions pushed to track changes
2017-03-30 13:33:02 +01:00
Brian Gough
527c02a00b log op versions pushed to track changes 2017-03-30 11:20:50 +01:00
Shane Kilkelly
64658d0034 Add a .nvmrc file 2017-03-27 14:50:09 +01:00
James Allen
51daffbc36 Merge pull request #29 from sharelatex/ja-support-undo-flag
Support an incoming undo flag for history restores
2017-03-21 15:15:21 +00:00
James Allen
0245bfd031 Support an incoming undo flag for history restores 2017-03-21 11:20:38 +00:00
James Allen
a3a5524778 Fix broken unit test from merge 2017-03-20 10:37:02 +00:00
James Allen
c8f0d0920e Merge pull request #28 from sharelatex/ja-cut-and-paste-comments
Update RangeTracker to support upserting and moving comments for cut …
2017-03-20 10:29:37 +00:00
James Allen
199079a5b7 Merge branch 'master' into ja-cut-and-paste-comments 2017-03-20 10:29:01 +00:00
James Allen
0b3c61e9c6 Merge pull request #27 from sharelatex/ja-verify-ranges
Add in a consistency check after applying updates that ranges still match
2017-03-20 10:28:34 +00:00
James Allen
9a933ee47b Merge branch 'master' into ja-verify-ranges 2017-03-20 10:23:49 +00:00
James Allen
667fb91567 Update RangesTracker to include undo logic 2017-03-17 15:44:37 +00:00
James Allen
9c5299ec7c Update RangeTracker to support upserting and moving comments for cut and paste 2017-03-16 15:49:41 +00:00
James Allen
5499a67d78 Add in a consistency check after applying updates that ranges still match 2017-03-15 14:12:06 +00:00
James Allen
16ebd155ec Merge pull request #26 from sharelatex/ja-wrap-track-changes-in-try-catch
Wrap RangeTracker in try catch
2017-03-06 19:25:16 +00:00
James Allen
b9e4492001 Wrap RangeTracker in try catch 2017-03-06 19:05:11 +00:00
James Allen
a3a9a726d8 Update unit tests 2017-03-06 12:01:18 +00:00
James Allen
a9b7949828 Merge pull request #22 from sharelatex/ja-increase-limits-on-changes
Increase limits on changes and set absolute limit on JSON data size
2017-03-06 11:57:57 +00:00
James Allen
d8135749d2 Merge branch 'master' into ja-increase-limits-on-changes
Conflicts:
	app/coffee/RedisManager.coffee
2017-03-06 11:57:40 +00:00
James Allen
30294dafb1 Merge pull request #23 from sharelatex/bg-upgrade-raven-logging
upgrade to logger-sharelatex 1.5.3
2017-03-06 11:53:47 +00:00
James Allen
269433f250 Merge pull request #25 from sharelatex/bg-log-doclines-on-hash-mismatch
log doclines on hash mismatch
2017-03-06 11:53:24 +00:00
James Allen
5ef12c6f18 Merge pull request #24 from sharelatex/bg-suppress-errors-from-redis-backend
don't log errors from redis backend
2017-03-06 11:53:09 +00:00
Brian Gough
501d907299 upgrade to logger-sharelatex 1.5.4 2017-03-03 16:08:14 +00:00
Brian Gough
d086e0b61b log doclines on hash mismatch 2017-03-03 15:57:44 +00:00
Brian Gough
3f13263ecf upgrade to logger-sharelatex 1.5.3 2017-03-03 15:32:11 +00:00
Brian Gough
b186a01c04 don't log errors from redis backend
this also picks up errors from RedisManager like "doc ops range is not
loaded in redis"
2017-03-03 15:27:42 +00:00
James Allen
d56bb55953 Revert PR #19 2017-03-01 16:49:46 +00:00
James Allen
9cfe651930 Merge pull request #19 from sharelatex/ja-track-changes
Don't consume partial parts of delete when inserting a change
2017-03-01 10:20:06 +01:00
James Allen
f544814dda Add in an absolute size limit on the ranges JSON object 2017-02-27 14:34:20 +01:00
James Allen
f211c282b2 Merge branch 'master' into ja-increase-limits-on-changes 2017-02-27 13:50:42 +01:00
James Allen
5a4884cccf Merge pull request #21 from sharelatex/ja-check-for-null-bytes
Check for null bytes before writing to redis and log hashes when writing
2017-02-27 10:26:35 +01:00
James Allen
dd45a8dd7d Improve logging around hashes and null byte errors 2017-02-27 10:06:24 +01:00
James Allen
60f3393c44 Do a naive check for null bytes after JSON.stringify on doc lines 2017-02-27 09:55:04 +01:00
James Allen
fd3dee0af5 Increase changes count limit to 2000 2017-02-24 14:58:47 +01:00
James Allen
80284e1b01 Only cancel deletes with inserts on undo and reject 2017-02-24 14:21:06 +01:00
James Allen
1ce51c45bf Merge pull request #20 from sharelatex/ja-reduce-ranges-logging
Reduce the data logged when updating ranges
2017-02-24 09:21:38 +01:00
James Allen
0420929e2a Reduce the data logged when updating ranges 2017-02-23 13:57:47 +01:00