Commit graph

42 commits

Author SHA1 Message Date
Brian Gough
2970a09d19 Merge pull request #8423 from overleaf/briangough-issue8388
increase lock and timeout for history resync to 6 minutes

GitOrigin-RevId: 2aea0cbc26c92ed0aad8f815ccd41a2abc0b752e
2022-06-20 08:04:03 +00:00
Alf Eaton
50df230846 [web] Upgrade Prettier to match version in monorepo root (#6231)
GitOrigin-RevId: 02f97af1b9704782eee77a0b7dfc477ada23e34d
2022-01-11 09:03:23 +00:00
Eric Mc Sween
b22df1dcba Merge pull request #5984 from overleaf/em-unnecessarily-async-functions
Clean up unnecessarily async functions

GitOrigin-RevId: 59f0f0a76b4436f3b99a09b747670d443bac4582
2021-12-07 09:03:33 +00:00
Eric Mc Sween
b8ab8fbdbd Merge pull request #5853 from overleaf/em-fix-file-tree
More filename fixes when resyncing

GitOrigin-RevId: 15e2e71fa8d16a1c708449eb607918b36f2fb3ee
2021-11-23 09:03:11 +00:00
Eric Mc Sween
642764fccf Merge pull request #5770 from overleaf/em-resync-clean-filename
Clean filenames before resync

GitOrigin-RevId: 46a408a8b7eb067b431db04951d92c029b833054
2021-11-16 09:02:51 +00:00
Brian Gough
aeb2ce7435 Fix up duplicate filenames during resync (#5742)
* Fix up duplicate filenames during resync

* Unit test for project history resync with duplicate paths

* Decaf cleanup: unnecessary returns

* Decaf cleanup: remove initClass()

* Decaf cleanup: unused variables

* Decaf cleanup: camel case variables

* Support duplicate folder names when traversing project folders

We have some broken projects that contain duplicate folder names. In
order to fix them, we need to be able to find them in the project. The
use of an object to store folders by path meant that only one of the
duplicate folders would be found.

* Keep docupdater up to date when renaming during a resync

Co-authored-by: Eric Mc Sween <eric.mcsween@overleaf.com>
GitOrigin-RevId: bf3dcdc4c1d4f5418ff9f5e68b255438620349ca
2021-11-12 09:02:56 +00:00
Brian Gough
3c780c65e8 Merge pull request #5417 from overleaf/hb-restore-doc-from-admin
Restore soft deleted docs from admin

GitOrigin-RevId: 5c94539ae950c401225d2cfe7c0bc978ed258e22
2021-10-26 08:03:31 +00:00
Brian Gough
1da0edbcaf Merge pull request #4801 from overleaf/ae-resync-editable-file
Use a file hash to decide if a file is editable when resyncing

GitOrigin-RevId: 57d78b3d73bf2595070a7c7eb7ec97eeece3a163
2021-08-24 08:03:28 +00:00
Jakob Ackermann
5e773ce950 Merge pull request #4101 from overleaf/ae-settings-module
Migrate from `settings-sharelatex` to `@overleaf/settings`

GitOrigin-RevId: 9a298ba26382180c1351683c5fddc9004418c1e6
2021-07-08 02:08:28 +00:00
Alf Eaton
1be43911b4 Merge pull request #3942 from overleaf/prettier-trailing-comma
Set Prettier's "trailingComma" setting to "es5"

GitOrigin-RevId: 9f14150511929a855b27467ad17be6ab262fe5d5
2021-04-28 02:10:01 +00:00
Alf Eaton
1ebc8a79cb Merge pull request #3495 from overleaf/ae-prettier-2
Upgrade Prettier to v2

GitOrigin-RevId: 85aa3fa1acb6332c4f58c46165a43d1a51471f33
2021-04-15 02:05:22 +00:00
Jakob Ackermann
9692392bf8 Merge pull request #3655 from overleaf/jpa-change-write-path-doc-deletion
[ProjectEntityUpdateHandler] change write path for doc deletion

GitOrigin-RevId: 7d7ece8fe25c1d59b3469c136d92c4c81e9f0f81
2021-04-07 02:04:57 +00:00
Jakob Ackermann
92194202d7 Merge pull request #3652 from overleaf/jpa-tell-docstore-doc-name-on-delete
[DocStoreManager] pass doc name as part of DELETE request

GitOrigin-RevId: cdb5fb21580a95aa8a78e0a44ca1e4db4da7f934
2021-04-07 02:04:49 +00:00
Eric Mc Sween
9ddaa8c9f6 Merge pull request #3830 from overleaf/em-upgrade-node-12
Upgrade to Node 12

GitOrigin-RevId: 19870922884b7c98e7e5f2c94df21829672d2db5
2021-04-01 02:05:52 +00:00
Simon Detheridge
9e2db00d53 Merge pull request #3845 from overleaf/ho-upload-file-mark-updated
mark project as updated when uploading/replacing files

GitOrigin-RevId: 948a3351ac59d4f08411dd83bb543444de0b9b52
2021-03-31 02:05:38 +00:00
Jakob Ackermann
ab87ed51b9 Merge pull request #3658 from overleaf/jpa-change-write-path-file-deletion
[ProjectEntityMongoUpdateHandler] track deleted files in own collection

GitOrigin-RevId: 7dff10a4737626a2d02b93b346e7e02a9d9a8608
2021-02-18 03:04:55 +00:00
Jakob Ackermann
7f6d439302 Merge pull request #3571 from overleaf/jpa-ask-docstore-is-doc-deleted
[ProjectEntityUpdateHandler] ask docstore whether a doc exists/isDeleted

GitOrigin-RevId: 54c6666b514b466b908b9ed57a26bc6cf66037d7
2021-02-10 03:04:35 +00:00
Jakob Ackermann
6eeb7857e3 Merge pull request #3390 from overleaf/jpa-faster-unit-tests
[perf] faster unit tests

GitOrigin-RevId: 188b8f3752638fde7a27a8d83b416bb9a6e3c95e
2020-11-28 03:04:01 +00:00
Jakob Ackermann
87634be542 Merge pull request #3351 from overleaf/revert-3348-revert-3298-jpa-re-land-mongoose-latest
[misc] re-land: remove mongojs and bump mongoose

GitOrigin-RevId: eba9f80fbd58dbb8aed131fead3ec0b928a555aa
2020-11-04 03:04:21 +00:00
Jakob Ackermann
e249a2e5be Merge pull request #3348 from overleaf/revert-3298-jpa-re-land-mongoose-latest
Revert "[misc] re-land: remove mongojs and bump mongoose"

GitOrigin-RevId: 45a284435c88898d96769ab258651fb8d6d20ff5
2020-11-03 03:05:09 +00:00
Jakob Ackermann
28fe397f38 Merge pull request #3298 from overleaf/jpa-re-land-mongoose-latest
[misc] re-land: remove mongojs and bump mongoose

GitOrigin-RevId: 02f78d52ffc2d373c8c0bc4860d3b2326a46f5c9
2020-11-03 03:04:52 +00:00
Simon Detheridge
c257b9695a Merge pull request #3277 from overleaf/revert-3257-jpa-mongoose-latest
Revert "[misc] upgrade mongoose to the latest version"

GitOrigin-RevId: d5957fca68be65a08a687476742ffbb9c3cb86e8
2020-10-13 02:04:31 +00:00
Simon Detheridge
dba5127856 Merge pull request #3257 from overleaf/jpa-mongoose-latest
[misc] upgrade mongoose to the latest version

GitOrigin-RevId: cc612312e1661a92907dd8d42a32aeccb8cdb62d
2020-10-13 02:04:26 +00:00
Jakob Ackermann
018a44eeb5 Merge pull request #3185 from overleaf/jpa-normalize-mongo-imports
[misc] normalize mongo imports

GitOrigin-RevId: ac653d9982e0d36736b90f4c03d4c00be88ea76a
2020-09-25 02:04:20 +00:00
Ersun Warncke
9c87ad9801 convert TpdsUpdateSender to async and cleanup
GitOrigin-RevId: a19830134a13a23775c604a05a7e093d00bbb2de
2020-05-28 03:16:26 +00:00
Eric Mc Sween
8ba63b0f8e Merge pull request #2849 from overleaf/em-convert-file-to-doc
Fix update order when converting a file to a doc

GitOrigin-RevId: a0c9488e3870cc972c21b40ff0e2577fcec40ee0
2020-05-21 03:22:07 +00:00
Eric Mc Sween
ae82366122 Merge pull request #2827 from overleaf/em-faster-clones
Make a single Mongo update when cloning projects

GitOrigin-RevId: abd4069bd8854d84c413bc8f890583e647b7c18e
2020-05-14 03:26:15 +00:00
Alasdair Smith
3a1ab63cce Merge pull request #2724 from overleaf/ns-doc-over-file
allow upload of doc over existing file

GitOrigin-RevId: 13578bf4ab6d54686077402488399db0379cc761
2020-04-28 03:21:52 +00:00
nate stemen
31b95e8617 Merge pull request #2603 from overleaf/jpa-ns-cmg-binary-upload
[ProjectEntityUpdateHandler] handle entity changes on upsert

GitOrigin-RevId: 134e2c8909db5a336bce62460e46b3e625463c6f
2020-03-19 04:17:18 +00:00
Eric Mc Sween
9f3b2d2cdc Merge pull request #2670 from overleaf/em-convert-doc-to-file-rev
Adjust the file rev when converting a doc to a file

GitOrigin-RevId: 6765bcac1fcd4f4db35f9ce88af1f201f5da509a
2020-03-17 04:18:15 +00:00
Eric Mc Sween
8547bb3c8d Merge pull request #2661 from overleaf/em-convert-doc-to-file-ranges
Do not convert a doc to file when it has ranges

GitOrigin-RevId: 52f0151e54c426178f80c34c6afac908bbf7b90d
2020-03-11 04:14:54 +00:00
Eric Mc Sween
2627595040 Merge pull request #2639 from overleaf/em-convert-doc-to-file
Endpoint for converting a doc to a file

GitOrigin-RevId: 0a3bd46a7a78537b0f64dc577402277cbe81fecb
2020-03-05 04:16:49 +00:00
Ersun Warncke
2c335802ca remove excessive logging
GitOrigin-RevId: 62024bbe0415a4fdae66eb1b9c6707e5faec7cd1
2019-11-27 12:17:32 +00:00
Eric Mc Sween
551a3debfd Merge pull request #2383 from overleaf/em-async-await
Complete move of ProjectEntityMongoUpdateHandler to async/await

GitOrigin-RevId: ebabcbbf3ffb3e94810564b4600ef1c03f546cf1
2019-11-21 13:00:38 +00:00
Eric Mc Sween
4f9eb281b7 Merge pull request #2356 from overleaf/em-upgrade-test-deps
Upgrade test dependencies

GitOrigin-RevId: 0bda49dea086f525211836b6008f67bafa2bbe48
2019-11-18 14:53:42 +00:00
Eric Mc Sween
27504d7b9d Merge pull request #2361 from overleaf/em-project-imports-2
Import full folder structure in a single Mongo update

GitOrigin-RevId: 623d2a098b2084fdd0193e1593c1c55c08a2d92d
2019-11-18 14:20:38 +00:00
Jessica Lawshe
ea0270dbdd Merge pull request #2168 from overleaf/pr-restrict-main-file-options
Restrict main file options based on extension.

GitOrigin-RevId: f7d7a61c0454621dd8bc6ab5edce8a89721018ea
2019-10-03 14:34:41 +00:00
Simon Detheridge
7588393580 Merge pull request #2047 from overleaf/spd-eslint-mocha-arrows
Enforce consistent callback style in mocha tests

GitOrigin-RevId: a64c293dae6926ef5831abe97eaf2044942a5c85
2019-08-07 15:29:25 +00:00
Shane Kilkelly
238e2b2565 Merge pull request #1937 from overleaf/spd-sandboxedmodule-global-console
Add 'console' to SandboxedModule globals

GitOrigin-RevId: fad442ca128561a4fa193b929f217cf31ad0f043
2019-07-15 10:44:47 +00:00
Timothée Alby
e73a5d9103 Merge pull request #1923 from overleaf/ta-error-log-level
Reduce Log Level

GitOrigin-RevId: 63a8859e6b78cb0774a28069089f4bce73eb91ec
2019-07-01 14:06:36 +00:00
Simon Detheridge
757ae39487 Merge pull request #1899 from overleaf/spd-implicit-return-tests
Decaf cleanup: Remove implicit return from 'it' and 'describe' in tests

GitOrigin-RevId: f297820e6212dddc0d60697a2fe1612ef27403b6
2019-06-21 13:58:57 +00:00
Alasdair Smith
0ca81de78c Merge pull request #1717 from overleaf/as-decaffeinate-backend
Decaffeinate backend

GitOrigin-RevId: 4ca9f94fc809cab6f47cec8254cacaf1bb3806fa
2019-05-29 09:32:21 +00:00