github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-10-17 21:05:04 -04:00
Code Issues Projects Releases Packages Wiki Activity
23027 commits 3 branches 7 tags 201 MiB
Commit graph

51 commits

Author SHA1 Message Date
Domagoj Kriskovic
6afb067737 Hide history-resync updates from "All history" (#19435) 
* [web] hide history-resync updates from "All history"

* Revert "[web] hide history-resync updates from "All history""

This reverts commit e9d5e7638eabe2baccf36f8c80bb4cd619e383ea.

* filter history resync update in summarizeUpdates

* used isHistoryResyncUpdate for merging

* remove merging for history-resync

* Revert "remove merging for history-resync"

This reverts commit 6ce48bc3f906867a64c0acc12e2dc61c05436c41.

GitOrigin-RevId: 0335eb9c05815fb66188d453a90dd09531504a55
 2024-07-19 08:04:21 +00:00
Brian Gough
9babc70df7 Merge pull request #17362 from overleaf/bg-chai-object-id-tests 
fix for chai object id tests

GitOrigin-RevId: 98123dbc930c6ee57be3a118177426120482c5f4
 2024-07-16 08:04:46 +00:00
Eric Mc Sween
58ffefc8bb Merge pull request #19298 from overleaf/em-fix-restore-empty-file 
Fix file restore when the file is empty

GitOrigin-RevId: be08305c9a41265acfb12046aeb2d003cda92b54
 2024-07-15 09:00:51 +00:00
Eric Mc Sween
e4cc2a0816 Fix history diffs when deleting over many tracked deletes (#19193) 
* Fix history diffs when deleting over many tracked deletes

As we are looping through tracked deletes, the offset between the result
positions and the source positions must be kept constant. Otherwise, the
tracked deletes are translated as we delete text and move the source
cursor.

GitOrigin-RevId: b2417a75219aaa16bf5c61e0ebcb0586cae6aef2
 2024-07-01 08:04:25 +00:00
Eric Mc Sween
9f0f42a012 Merge pull request #18930 from overleaf/em-resync-ranges 
Fix resyncs when diffs move ranges

GitOrigin-RevId: 121c3a16cf19649538445e6ed8bc0a1129735eb9
 2024-06-19 08:04:57 +00:00
Mathias Jakobsen
801a17af27 Merge pull request #18838 from overleaf/mj-history-detached-ranges 
[project-history] Handle detached ranges

GitOrigin-RevId: cdbe9b46a03d55fd7b865fdd87092aaad1920c62
 2024-06-13 08:04:32 +00:00
Eric Mc Sween
c070c036af Merge pull request #18747 from overleaf/em-update-compressor-comment-ids 
Propagate commentIds in UpdateCompressor

GitOrigin-RevId: 03315146c2dc816d02e69594df44d0d25f7952ca
 2024-06-07 08:04:13 +00:00
Eric Mc Sween
6c9d4fb522 Merge pull request #18716 from overleaf/em-tracked-delete-undo 
Fix translation of tracked deletes

GitOrigin-RevId: 4124db6953cbed46eea61f62118fc8e1ddfff4a0
 2024-06-06 08:04:43 +00:00
Eric Mc Sween
55c342134c Merge pull request #18659 from overleaf/em-crop-comments-tracked-deletes 
Crop comments when processing tracked deletes

GitOrigin-RevId: 662c9ed86a8ed4959d1671ce466548487f334f45
 2024-06-05 08:03:53 +00:00
Eric Mc Sween
c85f4ab5e5 Merge pull request #18491 from overleaf/em-filter-summarized-updates 
Filter out comment ops from summarized updates

GitOrigin-RevId: 97a44821b6dc001cd1ea84115cf69c8d712e9946
 2024-05-31 08:04:18 +00:00
Mathias Jakobsen
f14fdc7b7c Merge pull request #17958 from overleaf/mj-web-revert-file 
[web] Initial version of file reverting

GitOrigin-RevId: ef500b2c3ddf21b0acb6650c2526edd10ab2cc18
 2024-05-29 08:04:16 +00:00
Eric Mc Sween
8704e430a4 Merge pull request #18468 from overleaf/em-docupdater-resolved-comment-ids 
Store resolved comment ids in docupdater

GitOrigin-RevId: 69f09ecf69deedbb9a3682f13356533799025ea8
 2024-05-29 08:04:01 +00:00
Eric Mc Sween
6d216d4738 Merge pull request #18355 from overleaf/em-resync-tracked-changes 
Handle tracked changes during resyncs

GitOrigin-RevId: 1d5b16a4cb17226da184a5430ebbcfc79ad9c7ce
 2024-05-27 10:23:02 +00:00
Eric Mc Sween
5d0190da0f Merge pull request #18342 from overleaf/em-tracking-props-none 
Separate handling of "none" tracking type in operations

GitOrigin-RevId: b07ee5320ac1a9c63e3b0059aade1a1564819943
 2024-05-17 08:04:46 +00:00
Mathias Jakobsen
655f9b50ae Merge pull request #18309 from overleaf/mj-add-comment-resolved 
[overleaf-editor-core] Omit resolved: false for comments serialisation

GitOrigin-RevId: 909f20efd8f3c3e50d40e09366951d317a4c31bf
 2024-05-16 08:04:46 +00:00
Antoine Clausse
373b656e75 Remove @ts-check from SyncManagerTests.js (#18291) 
Fix broken CI `project-history-pr-trigger`

GitOrigin-RevId: 3bfa666cbce57628f167567daebdd5ff0e1b1e47
 2024-05-13 08:03:47 +00:00
Eric Mc Sween
b75ba32774 Merge pull request #18114 from overleaf/em-resync-comments 
Handle comments when resyncing history

GitOrigin-RevId: cd848fbd91f017a0a66e46df5c009bd16498d154
 2024-05-06 08:04:25 +00:00
Jakob Ackermann
a540754f6e Merge pull request #18116 from overleaf/jpa-bulk-replace-localhost 
[misc] bulk replace localhost with 127.0.0.1

GitOrigin-RevId: d238f3635302e8ff5500d611108c4d1bef216726
 2024-04-26 08:04:39 +00:00
Mathias Jakobsen
36ad15c405 Merge pull request #17859 from overleaf/mj-project-history-ranges-at-version 
[overleaf-editor-core+project-history] Add endpoint to fetch ranges from version

GitOrigin-RevId: fbe8e8ef3636b344006375a92057cfc580a74616
 2024-04-22 08:04:11 +00:00
Domagoj Kriskovic
c4437c69bc Send operations to project-history when accepting tracked changes (#17599) 
* added getHistoryOpForAcceptedChange in RangesManager

* rename adjustHistoryUpdatesMetadata to be treated as public

* handle retain op in UpdateTranslator and updateCompressor

* send op to project-history in acceptChanges

* use promises.queueOps

* use ranges in getHistoryOpForAcceptedChange

* using rangesWithChangeRemoved

* acceptChanges acceptance test

* using change.op.hpos

* Revert "using change.op.hpos"

This reverts commit f53333b5099c840ab8fb8bb08df198ad6cfa2d84.

* use getHistoryOpForAcceptedChanges

* fix historyDocLength

* Revert "rename adjustHistoryUpdatesMetadata to be treated as public"

This reverts commit 2ba9443fd040a5c953828584285887c00dc40ea6.

* fix typescript issues

* sort changes before creating history updates

* fix tests

* sinon spy RangesManager.getHistoryUpdatesForAcceptedChanges

* added unit tests

* sort deletes before inserts

* use getDocLength function

* fix docLength calculation

* fix typo

* allow all retains

* fix lint error

* refactor RangesTests

* fix ts error

* fix history_doc_length calculation in RangesManager

* remove retain tracking check from UpdateCompressor

* use makeRanges() properly in tests

* refactor acceptance tests

GitOrigin-RevId: ab12ec53c5f52c20d44827c6037335e048f2edb0
 2024-04-17 08:04:17 +00:00
Eric Mc Sween
ab17eb150d Merge pull request #17745 from overleaf/em-promisify-snapshot-manager 
Promisify SnapshotManager

GitOrigin-RevId: 1fa7124da3aa3e0be5db372e68e286d63f496a97
 2024-04-15 08:04:46 +00:00
Eric Mc Sween
d12a0b5f07 Merge pull request #17735 from overleaf/em-promisify-web-api-manager 
Promisify WebApiManager

GitOrigin-RevId: 95addc9442845252aa51c353676486b2dbce0662
 2024-04-12 08:05:39 +00:00
Eric Mc Sween
3b555ac9e6 Merge pull request #17731 from overleaf/em-promisify-error-recorder 
Promisify ErrorRecorder

GitOrigin-RevId: 3736567272a09b4e3b9075118460392c1f66f0d7
 2024-04-12 08:05:34 +00:00
Eric Mc Sween
f03e3fd51e Merge pull request #17729 from overleaf/em-promisify-sync-manager 
Promisify SyncManager

GitOrigin-RevId: 134770d812a493e39410debb370ed4a58ffff4bf
 2024-04-12 08:05:29 +00:00
Domagoj Kriskovic
1557338775 [project-history] fix convertToDiffUpdates when track delete is moved by previous op (#17681) 
* [project-history] fix convertToDiffUpdates

* fix test

* preserve source ranges for applyRetain

* use sourceRanges for applyDelete

* use cursor difference for offset

* move statement to closer to original

* handle deletion before tracked delete

* Revert "handle deletion before tracked delete"

This reverts commit 6f2570f22473bd64516c166b29a34639ec701230.

* using resultCursor and sourceCursor

* refactor, use scanCursor

* skip track delete properly

* prettier

* remove .sort() in applyRetain

* small test fixes

GitOrigin-RevId: 94755c219c90d6fedcdc64284d71137cf56d2442
 2024-04-10 08:04:03 +00:00
Mathias Jakobsen
7d7e5c9a8f Merge pull request #17782 from overleaf/mj-project-history-merge-test-fix 
[project-history] Fix project history unit test

GitOrigin-RevId: 4a8c5c2337ee8a06d46638ceba18d4a0f8742b42
 2024-04-08 08:04:21 +00:00
Mathias Jakobsen
815c29cf82 Merge pull request #17396 from overleaf/mj-version-filtering 
[overleaf-editor-core+project-history] Filter tracked changes when fetching files

GitOrigin-RevId: 935e4c4712f31b77070aec545a849fc6fefedcd9
 2024-04-08 08:04:17 +00:00
Eric Mc Sween
7a6b03cf7c Merge pull request #17667 from overleaf/em-history-comment-ids 
Handle the commentIds property in project-history

GitOrigin-RevId: 39502a88f97e531b436a1b2d4f791c73e31bb401
 2024-04-03 08:04:02 +00:00
Eric Mc Sween
59703ef745 Merge pull request #17662 from overleaf/em-handle-tcs-history 
Reintroduce tracked changes handling in project-history

GitOrigin-RevId: f6d72fbffc9b2d2328edc35ffb3f328a31d95e6a
 2024-03-28 09:04:57 +00:00
Eric Mc Sween
919a83c193 Merge pull request #17649 from overleaf/em-revert-handle-tcs 
Revert tracked changes handling in project-history

GitOrigin-RevId: 1671378e12c8e98354cdad28abc9498600f79479
 2024-03-27 09:04:30 +00:00
Eric Mc Sween
3ab54b5b14 Merge pull request #17368 from overleaf/em-handle-metadata 
Handle tracked changes in project-history

GitOrigin-RevId: 9c790a4dcd874f0d68173fc65cb6823a4da55cc6
 2024-03-27 09:04:19 +00:00
Mathias Jakobsen
4ef7bc617b Merge pull request #17196 from overleaf/mj-tracked-deletes-filtering 
[project-history] Filter tracked deletes from diff views

GitOrigin-RevId: 32c49a740932ef28534b82d390fe00e6500864ca
 2024-03-13 09:03:19 +00:00
Eric Mc Sween
cd1773773e Merge pull request #17162 from overleaf/em-handle-comments 
Handle comment updates in project-history

GitOrigin-RevId: 46f0043c1c20200bdb665e66643a7870c18d797f
 2024-02-21 09:03:27 +00:00
Jakob Ackermann
63520c7076 Merge pull request #16859 from overleaf/jpa-sharelatex-cleanup 
[misc] ShareLaTeX cleanup - high impact

GitOrigin-RevId: 6dcce9b0f15e30f7afcf6d69c3df36a369f38120
 2024-02-09 09:04:11 +00:00
Mathias Jakobsen
43b2fe4a3a [overleaf-editor-core] Restructure TextOperation hierachy (#16582) 
* [overleaf-editor-core] Restructure TextOperation hierachy

Restructures the hierachy of TextOperations to include a superclass
EditOperation. This superclass will later on contain other classes used
for tracked changes and comments.

* [overleaf-editor-core] Update json format of LazyStringFileData

* [history-v1+project-history] Fix TextOperation.fromJSON calls

* [overleaf-editor-core] Change EditOperationBuilder.fromRaw to fromJSON

* [overleaf-editor-core] Update apply and invert functions to accept FileData

* [overleaf-editor-core] Pass missing argument to store method

* [overleaf-editor-core] Remove unused method

* [overleaf-editor-core] User EditOperationTransformer

* [overleaf-editor-core] Clean up JSDoc comments

* [overleaf-editor-core] Add tests for EditOperation

* [overleaf-editor-core] Update JSDoc types

GitOrigin-RevId: 9c22a3a89b8483bdb87b43f329ddbdd887ffed42
 2024-01-24 09:04:18 +00:00
David
e3513a9d50 Merge pull request #16545 from overleaf/dp-project-owner-delete-labels 
Allow project owners to delete history labels

GitOrigin-RevId: 16111337681ac4085db2cf48e9d4c2fa87993b77
 2024-01-23 09:03:08 +00:00
Christopher Hoskin
ced8a923c0 Merge pull request #16218 from overleaf/csh-issue-11625-mongo-ug-5-project-history 
Upgrade mongodb module for project-history

GitOrigin-RevId: 18782896b46b2b0512a1ce50215bb98ac3d46cea
 2023-12-18 09:04:07 +00:00
Jakob Ackermann
47820c61a0 Merge pull request #15409 from overleaf/jpa-history-v1-http-timeout 
[history-v1] make http request timeout configurable

GitOrigin-RevId: b31b1c94563ddb5195f92af303e6b0f234856795
 2023-10-25 08:04:50 +00:00
ilkin-overleaf
6db48cdaa3 Merge pull request #14235 from overleaf/ii-history-project-diff 
Project history diff fix

GitOrigin-RevId: 42d55425873aa610560a03609c01e55606894940
 2023-08-17 08:02:54 +00:00
Eric Mc Sween
b750948e00 Merge pull request #13780 from overleaf/em-fetch-utils-project-history 
Use fetch-utils in project-history

GitOrigin-RevId: 96afc5f3961210baa7ad597645b725fe2d8d3529
 2023-07-17 11:00:49 +00:00
Miguel Serrano
21eada08ef Merge pull request #13574 from overleaf/msm-fix-history-anon 
Fix 'anonymous-user' edits breaking history

GitOrigin-RevId: 4141477e7987c0354a419d2c5d8203b6efcf673d
 2023-07-17 10:48:20 +00:00
Tim Down
66dc566752 Merge pull request #13039 from overleaf/td-history-auto-select-file-ignore-binary 
History migration: Ignore binary files when auto-selecting file to display in history view

GitOrigin-RevId: 7d2a314cdb3d54e4e2292a95e7633e3829ea931f
 2023-05-26 08:04:29 +00:00
Jakob Ackermann
51af6558cc Merge pull request #12831 from overleaf/jpa-project-history-pipe 
[project-history] migrate to fetch/stream.pipeline

GitOrigin-RevId: 9224eab6a0ad9cbb0c80e443a1c0d4abdd9bbd0f
 2023-05-09 08:04:14 +00:00
Eric Mc Sween
5fe98bf0fd Merge pull request #12210 from overleaf/em-camel-case-project-history 
Camel case variables in project-history

GitOrigin-RevId: 299245883b44366911ee43ee7e644a7bfa3d8319
 2023-03-21 09:05:13 +00:00
Brian Gough
fc9955e719 Merge pull request #12035 from overleaf/bg-clear-first-op-timestamp-3 
skip adding timestamp when flushing old projects

GitOrigin-RevId: a420da0e1c2aecd1589d857744353fb5e014aa32
 2023-03-01 09:03:55 +00:00
Eric Mc Sween
3ead64344f Merge pull request #11952 from overleaf/em-batch-redis-reads 
Read updates from Redis in smaller batches

GitOrigin-RevId: 06901e4a9e43976e446c014d5d46c2488691c205
 2023-02-28 09:04:23 +00:00
Eric Mc Sween
f6bfc14a79 Merge pull request #11913 from overleaf/em-revert-batch-redis-reads 
Revert batched Redis reads

GitOrigin-RevId: 4f71dcb7a7e7ae92046ab7edef0930c0358da945
 2023-02-21 09:05:26 +00:00
Eric Mc Sween
61bc701f7e Merge pull request #11864 from overleaf/em-batch-redis-reads 
Read updates from Redis in smaller batches

GitOrigin-RevId: 847c3a65bc8acc275cd6ddaad1e4ef18c7d0287c
 2023-02-21 09:05:18 +00:00
Eric Mc Sween
a7c9e3b20f Merge pull request #11790 from overleaf/em-promisify-redis-manager 
Clean up and promisify RedisManager in project-history

GitOrigin-RevId: 8bd8bb7d51a0a68f7b1a97ffa310a674086714ba
 2023-02-17 09:04:08 +00:00
Miguel Serrano
98cf5765e9 Merge pull request #11287 from overleaf/bg-clear-first-op-timestamp-2 
clear the first op timestamp whenever the queue is processed (2nd attempt)

GitOrigin-RevId: 0764ca6360b2a9203e5d32499213b312563a2c47
 2023-02-09 14:34:49 +00:00