Commit graph

370 commits

Author SHA1 Message Date
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
James Allen
e1481df76a Don't consume partial parts of delete when inserting a change 2017-02-23 11:39:19 +01:00
Brian Gough
49271d4ee4 update logger to 1.5.2 - rate limiting on sentry 2017-02-23 10:15:56 +00:00
James Allen
5ab903169a evert "update logger to 1.5.2 - rate limiting on sentry"
This reverts commit ba1c4a84959cd2eb33d7d624239d3e621ebae1fd.
2017-02-22 18:26:42 +01:00
James Allen
d6b5cc6389 Increase changes limit to 1200 2017-02-22 18:11:55 +01:00
Brian Gough
ed59ca32fd update logger to 1.5.2 - rate limiting on sentry 2017-02-22 15:58:40 +00:00
Brian Gough
168bab6960 make hash error logging fine grained 2017-02-22 14:32:51 +00:00
Brian Gough
19e7522d3f make logging of hash errors optional 2017-02-22 13:46:34 +00:00
Brian Gough
8d1b11f37a Merge branch 'bg-verify-writes-II' 2017-02-21 16:03:48 +00:00
Brian Gough
5eb339e525 fix utf8 encoding in sha1 hash 2017-02-21 16:03:06 +00:00
Brian Gough
6b808522dc Merge pull request #18 from sharelatex/bg-verify-writes
merge redis hash check
2017-02-20 15:55:19 +00:00
Brian Gough
e7fe22a467 Merge pull request #17 from sharelatex/bg-verify-writes-II
compute hash on write in redis server
2017-02-20 15:54:29 +00:00
Brian Gough
590f8e7ced Merge pull request #15 from sharelatex/bg-verify-writes
store sha1 hash of docLines in redis
2017-02-20 15:53:56 +00:00
Brian Gough
62165ddeab add unit tests 2017-02-20 15:33:19 +00:00
Brian Gough
c57d3ce31c compute hash on write in redis server 2017-02-20 14:09:09 +00:00
Brian Gough
a3c127e469 added unit tests 2017-02-20 13:53:25 +00:00
Shane Kilkelly
37172a2115 Debug Acceptance Tests: Try without npm rebuild 2017-02-20 09:22:54 +00:00
Shane Kilkelly
28536bfe73 try running mochatest directly without compiling 2017-02-17 16:14:13 +00:00
James Allen
660752dfa6 Increase change limit to 1000 2017-02-17 15:32:44 +01:00