Commit graph

20706 commits

Author SHA1 Message Date
Miguel Serrano
8ff0cf3f1e Merge pull request #12469 from overleaf/jpa-hotfix-3-5-6
[misc] Server Pro/CE hotfix 3.5.6

GitOrigin-RevId: 936aa8fd3c05a765e64c5ce14d5f6648773876b6
2023-05-05 08:05:18 +00:00
Rebeka
e3a0d236ae fix: color should be persisted on the disabled menu item when hovering over it
GitOrigin-RevId: e594388b36de986c02114aa652f6fe9c9d705c5d
2023-05-05 08:05:10 +00:00
Eric Mc Sween
e323a22666 Merge pull request #12932 from overleaf/em-history-chunks-project-deletion
Use index when deleting project history chunks

GitOrigin-RevId: 804b8fe8da8bab04a4c0e9fe0008c5554b51817e
2023-05-05 08:05:02 +00:00
Tim Down
a0e3379c86 Merge pull request #12939 from overleaf/td-history-more-update-scroll-amount
History migration: More update button scrolls next change to the centre

GitOrigin-RevId: 29d41a046f7110c246a0b9c784dedf6b148ea298
2023-05-05 08:04:53 +00:00
Tim Down
27457133e4 Merge pull request #12873 from overleaf/td-history-loading-improvements
History migration: Improve loading logic and display for loading file diffs

GitOrigin-RevId: 9d20c4632e6a804cb21e6fffd52faa88bc03f01a
2023-05-05 08:04:45 +00:00
Tim Down
95646a1bd5 Merge pull request #12936 from overleaf/td-history-diff-viewer-fixed-font
History migration: Use fixed font, text size, line height and theme in document diff viewer

GitOrigin-RevId: 9f86be609e0fe72ca41429bae9db03e047952c08
2023-05-05 08:04:37 +00:00
Jakob Ackermann
a3333fe3f1 Merge pull request #12949 from overleaf/jpa-upgrade-eslint-plugin-mocha
[misc] upgrade eslint-plugin-mocha for node 18 support of its dependency

GitOrigin-RevId: 48762daf5de83c2f2dbd1ffda0a695be81eefade
2023-05-05 08:04:28 +00:00
Jakob Ackermann
856e1e4025 Merge pull request #12935 from overleaf/jpa-include-patches
[misc] make npm package patches available to all the services

GitOrigin-RevId: 4e53f8af15f009d5e7c44d00b87b7592b6175541
2023-05-05 08:04:13 +00:00
June Kelly
7d1d34726e Merge pull request #12914 from overleaf/mf-sort-file-tree-history-react
Sort react history file tree items with the same rule as the angular history file tree

GitOrigin-RevId: da3d3195fff1f5b05b232b329fc3cf38a65743f6
2023-05-05 08:04:04 +00:00
Eric Mc Sween
8a0a67e2bb Merge pull request #12880 from overleaf/em-hash-oauth-secrets-4
Hash secrets when creating OAuth clients

GitOrigin-RevId: 5fb05bd825ceaabda635fe554a95879773aa3396
2023-05-04 08:06:12 +00:00
Jakob Ackermann
b0633b3a47 Merge pull request #12842 from overleaf/jpa-logout
[web] remove GET /logout endpoints

GitOrigin-RevId: 93f9498fdb66ece5028d90941aac50cda2737604
2023-05-04 08:05:57 +00:00
Eric Mc Sween
d5242379f2 Merge pull request #12912 from overleaf/em-server-pro-oauth-indexes
Add missing OAuth indexes in ServerPro

GitOrigin-RevId: 6cd37c1d884d30d5ec040f7d60961c8854e51273
2023-05-04 08:05:48 +00:00
Rebeka
0c54e6605b Remove deprecated uses of badge style
GitOrigin-RevId: 47234e95acd42d7e5d23de8e3b67edca2bdd98d1
2023-05-04 08:05:40 +00:00
Alf Eaton
680a02892c Duplicate the cloneSelectionVertically key mapping to re-allow Ctrl on macOS (#12918)
GitOrigin-RevId: 747e8889b5e3b34dd9ffef888f4a1d42fea1af74
2023-05-04 08:05:31 +00:00
Alf Eaton
2093d85a5f Exclude CtrlSym commands from completion (#12905)
GitOrigin-RevId: f6d1813eba6c17444d2371b024f538137c244963
2023-05-04 08:05:23 +00:00
Alf Eaton
b010d6a5d3 Handle unset editor theme (#12892)
GitOrigin-RevId: 0e3413c08c6fd0752cd90ee868fec9b0f9f77437
2023-05-04 08:05:14 +00:00
Alf Eaton
2796f750ee Rename TrackChangesToggleButton prop to match onMouseDown attribute (#12862)
GitOrigin-RevId: bf2a83c58298ee809f181d95beddec695d223922
2023-05-04 08:05:05 +00:00
Alf Eaton
09c5bf72d2 [cm6] Use Cmd on macOS for cloneSelectionVertically (#12855)
GitOrigin-RevId: ea72da47f2ebb377cf22af061ab616a021950502
2023-05-04 08:04:57 +00:00
Alf Eaton
8a12c34fce [cm6] Emacs: close search form when Enter is pressed in "Find" input (#12841)
GitOrigin-RevId: a4c974f45e0dbb13d96b9b424f056768449791fb
2023-05-04 08:04:49 +00:00
Alf Eaton
6c21f0821c [cm6] Handle multiple selection ranges when applying snippets (#12830)
* Use fork of @codemirror/autocomplete
* Handle multiple selection ranges when applying snippets

GitOrigin-RevId: 04afc087ac127206463ea3d4950284a50308364a
2023-05-04 08:04:39 +00:00
Alf Eaton
05582567b4 Improve performance of search match counting (#12808)
GitOrigin-RevId: 70cd1aaf5b079cbd540c4a9f92a04fcb2786b308
2023-05-04 08:04:30 +00:00
Eric Mc Sween
05f963d17d Merge pull request #12878 from overleaf/em-hash-oauth-secrets-2
Script for hashing OAuth secrets

GitOrigin-RevId: 7e2198ff9b41a24b1ca84768c24f3f653243c030
2023-05-02 19:46:13 +00:00
Eric Mc Sween
66d29940c3 Merge pull request #12861 from overleaf/em-ds-delete-chunk-migration
Better indexes for history chunks deletion

GitOrigin-RevId: 1404f5a0535bc94cb1e9d7fc2ea66fd90f584fea
2023-05-02 19:45:57 +00:00
Eric Mc Sween
cc604376c5 Merge pull request #12882 from overleaf/em-git-bridge-swap-job-config
Disable swap job when swap store is unsafe

GitOrigin-RevId: 104b03e378e7802f9ba6ff96b5a626a2fa7960fb
2023-05-02 19:45:48 +00:00
Tim Down
da916c9c13 Merge pull request #12906 from overleaf/td-history-fix-labels-test
Expect correct number of labels in history version list test

GitOrigin-RevId: 2a56b21c7359aad5111a2a7879f31fb5e7c6b73d
2023-05-02 19:45:40 +00:00
Tim Down
7f17992cbc Merge pull request #12870 from overleaf/td-history-prevent-diff-render-on-label-change
History migration: prevent unnecessary render when adding or deleting a label

GitOrigin-RevId: acabd581403f17f863e3bd0c06d1fbd77fe22228
2023-05-02 19:45:31 +00:00
Tim Down
76103eb77f Merge pull request #12874 from overleaf/td-history-binary-file
History migration: Show alert for binary file preview

GitOrigin-RevId: f30e4946ce9f873661055b8a096c6aba7ab08e2d
2023-05-02 19:45:22 +00:00
Tim Down
a19dffeac2 Merge pull request #12877 from overleaf/td-history-file-tree-keyboard
History migration: Only activate document in file tree for space and enter keys

GitOrigin-RevId: 166a9ba36b1f19cd4e50d0e6f63ce04b164512cf
2023-05-02 19:45:14 +00:00
Tim Down
91db36bc01 Merge pull request #12883 from overleaf/td-history-deletion-marker-fix
History migration: Fix deletion marker class in theme

GitOrigin-RevId: d84c97632f467b116024ffc0992970b9aa586294
2023-05-02 19:45:05 +00:00
M Fahru
9e5aabea33 Implement auto retry mechanism for deleted file restore in history react (#12866)
GitOrigin-RevId: b30895061ee6fdfb6488d27ce2f91d4e410735aa
2023-05-02 19:44:57 +00:00
Tim Down
1fb921de99 History migration: Add error handling for all history requests (#12872)
* Add error handling for all history requests

* Remove comment

GitOrigin-RevId: 528dc98a0fc4ab523f8536274996c4166be45064
2023-05-02 19:44:48 +00:00
Tim Down
70bae34bd8 Add paywall to React history view (#12849)
* Implement history view paywall

* Add tests and some CSS fallbacks

* Make additional faded version above paywall non-clickable

* Change isFaded to faded for consistency

* Remove unused import

* Add missing attribute

* SHow all labels in free tier

* Address review comments

* Change Boolean conversion

Co-authored-by: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>

* Make adding or deleting a label show up in version list again

* Refactor to use visibleUpdateCount rather than maintaining two separate update arrays

* Removed unused import

* Use data-testid instead on class

* Round gradient values

* Correct test selector

---------

Co-authored-by: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>
GitOrigin-RevId: a2b021f3f4d3b9eb1358edb2ee4aa7db1bc7240e
2023-05-02 19:44:39 +00:00
June Kelly
e89b4b4214 Merge pull request #12811 from overleaf/jk-plans-event-currency-segmentation
[web] Add currency/id segmentation to Recurly analytics events

GitOrigin-RevId: 56998f403358d5f6b3cece6835e16e65e06635b1
2023-05-02 19:44:24 +00:00
ilkin-overleaf
5480e1b371 Merge pull request #12850 from overleaf/ii-history-react-fix-disappeared-pseudo-labels
[web] Fix disappeared pseudo labels

GitOrigin-RevId: 4d33eb8888cadbccba29ac001e205db8fa717c49
2023-05-02 19:44:15 +00:00
Miguel Serrano
0564532f92 [git-bridge] Add support for Oauth2 Personal Access Tokens (#12795)
* [git-bridge] Add support for Oauth2 Personal Access Tokens

Adds support for Personal Access Tokens by sending a Bearer
token authentication when the username is `git`.
The feature is controlled by `GIT_BRIDGE_ACCESS_TOKEN_ENABLED`

---------

Co-authored-by: Eric Mc Sween <5454374+emcsween@users.noreply.github.com>
GitOrigin-RevId: 5553b0b68574158ede86ceec6c618cf4c4b09c92
2023-05-02 19:43:59 +00:00
Brian Gough
1da76f0a8d Merge pull request #12848 from overleaf/bg-fix-path-exception
add exception handling for  path.join in ProjectEntityHandler

GitOrigin-RevId: dad305057fd6b2821525ca5b6d1933824989e241
2023-05-02 19:43:50 +00:00
Jakob Ackermann
6ef9be0d0c Merge pull request #12858 from overleaf/jpa-server-ce-script-change-compile-timeout
[web] server-ce-script: add script for changing compile timeout for user

GitOrigin-RevId: 3718b970661e1ede04402889c240ecdabdcc7eff
2023-05-01 08:05:20 +00:00
Jakob Ackermann
cb16efdc53 Merge pull request #12853 from overleaf/jpa-tweak-filestore-test-output
[filestore] add ss header to error output when sockets are leaking

GitOrigin-RevId: 9aa61c99eaf74a061ea0b524c236abbc6f1c9846
2023-05-01 08:05:11 +00:00
Alf Eaton
e0d9069131 [cm6] Add "within selection" option to the search form (#12798)
* Use forked @codemirror/search
* Use getPanel to get the search panel
* Remove layer-based highlightSelectionMatches
* Add "within selection" option to the search form
* Add test for "replace all within selection"
* Fix tests

GitOrigin-RevId: 95ce76fd017f96278b04c16a1fd34f785f7504a3
2023-05-01 08:05:02 +00:00
Alf Eaton
7f7443356c Merge pull request #12738 from overleaf/mj-disable-ace-beta-users
[web] Hide Ace editor for beta users

GitOrigin-RevId: 7e359823429656862c4701e55686ebfd3f1f7a36
2023-05-01 08:04:53 +00:00
Alf Eaton
2606c76aec Merge pull request #12805 from overleaf/ae-markdown-types
[cm6] Fix type for Markdown language loader

GitOrigin-RevId: 725e1b28dd73e9090638f5d682e48e658c957a04
2023-05-01 08:04:45 +00:00
Alf Eaton
1da94f029c [cm6] Avoid selecting a search match when re-opening the search panel (#12797)
GitOrigin-RevId: 32bb03b71ce56cc0dbe6f7c92cc6d85151ef1971
2023-05-01 08:04:36 +00:00
Alf Eaton
40cbfc451a [cm6] Improve search match scrolling into view (#12787)
GitOrigin-RevId: 6ce9b86253a9c3a2c6ff44c10f78204ff16bd6e2
2023-05-01 08:04:27 +00:00
Alf Eaton
c53411ff1d Merge pull request #12776 from overleaf/ae-search-close-tooltip
[cm6] Add tooltip to search panel close button

GitOrigin-RevId: ba7f4ca5d672580054cb6214be94497fd5141730
2023-05-01 08:04:17 +00:00
Alf Eaton
f3205c1d06 Merge pull request #12768 from overleaf/ae-upgrade-codemirror-3
[cm6] Upgrade CodeMirror dependencies

GitOrigin-RevId: aa2d3473deee940fc86ac18261c0e0c35af53711
2023-05-01 08:04:07 +00:00
M Fahru
0648b8aa6c Implement deleted file restore for history react (#12753)
* Add strikethrough to deleted file tree item in history file tree

* Add "restore file" button on toolbar if the selected file have a `removed` operation.

* Implement "restore file" functionality on removed file:

- Refactor the `Selection` object in history context value since we need the `deletedAtV` data which currently is not passed through the state.
- Refactor and clean up file tree type system to support passing through the whole `FileDiff` object for getting the `deletedAtV` data which only appear on `removed` operation
- Implement `postJSON` with file restoration API and pass it on restore file onClick handler at toolbar

* Implement loading behaviour while restoring file is inflight:

- Add `loadingRestoreFile` to `LoadingState`
- Change restore file button to `Restoring...` when in loading state.

* Refactor:

- Rename `DiffOperation` to `FileOperation`
- Extract `isFileRemoved` and `isFileRenamed` to its own file
- Extract `Toolbar` components into small files

GitOrigin-RevId: 2e32ebd2165f73fc6533ff282a9c084162efd682
2023-04-28 08:04:59 +00:00
Jessica Lawshe
0de648eecd Merge pull request #12774 from overleaf/ds-em-mongo-secondary-db-fix
Bug fix - Mongo DB secondary preference

GitOrigin-RevId: d9adc0a7e1ee5085b34c5c1ddfdc715967607fc3
2023-04-28 08:04:51 +00:00
Jessica Lawshe
afb810c2a1 Merge pull request #12772 from overleaf/td-history-infinite-scroll-fix
Fix bug in infinite scrolling in history view

GitOrigin-RevId: ae71e96a17197451ae583e5614adbbd9dda93ee0
2023-04-28 08:04:42 +00:00
Jessica Lawshe
8be17cdb37 Merge pull request #12819 from overleaf/jpa-institutions-lookup
[web] migrate /institutions/ proxies to explicit V1 requests

GitOrigin-RevId: 535da280a6350dacbe2c957d2f2cedaeee02a48a
2023-04-28 08:04:34 +00:00
Domagoj Kriskovic
3d5e8c9877 add 'Ace removal' notification (#12800)
* add 'Ace removal' notification

* prettier

* add memo, window.clearTimeout

* remove warning for server pro

* added tracking events

* useCallback for onClick

* fix: event rename

GitOrigin-RevId: 70bce8b93bae233e7183a941abaf2ec7a70ddfb6
2023-04-28 08:04:19 +00:00