Commit graph

20221 commits

Author SHA1 Message Date
M Fahru
4dec157e08 Implement history react toolbar UI (#12530)
There are two different UI in this PR: `comparing` and `viewing` mode.

- For `comparing`, the user would be shown two separate date. It uses the `UpdateRange` object and this PR adds a timestamp to both `fromV` and `toV` of the object type.
- For `viewing`, the user would only be shown one date since `viewing` mode means viewing a specific update version.

Some other notable changes:

- Move `diff` state to `diff-view.tsx`, which contains `main.tsx` (main editor history view) and `toolbar.tsx` as its children
- refactor `autoSelectFile` by passing `updateRange.toV` directly
- refactor `updateIsSelected` by passing an object that contains `fromV` and `toV` instead of passing `update

There's also a cypress test for both the `viewing` mode and `comparing` mode in this PR.

GitOrigin-RevId: ba54f073f3479c55a39eb6b2932ea7faff78dddc
2023-04-21 08:03:39 +00:00
M Fahru
08d2eea47a Decouple history-file-tree styling out of editor file tree:
- Extract/duplicate the style from editor file tree (only extract styling that's being used in history file tree)
- Change some of the class name to avoid duplicated class name from the editor file tree
- Revert change to editor file tree since it has been moved to history file tree

GitOrigin-RevId: 6c3b20080c9b428363024db622f60e3540d919e6
2023-04-21 08:03:36 +00:00
Ilkin Ismailov
dd5509b16f add sm size to badge
GitOrigin-RevId: 4e69d582ce770abcff10f3a6b34662f4873fc224
2023-04-21 08:03:33 +00:00
M Fahru
8212b686c6 Implement new style for history file tree badge
GitOrigin-RevId: 6221bc00e5aecf49fd3f2657128d1e9a2d4e648b
2023-04-21 08:03:30 +00:00
Jakob Ackermann
0b985c7a0b Merge pull request #12723 from overleaf/jpa-revert-node-18-upgrade
[misc] revert node 18 upgrade

GitOrigin-RevId: 752d45b015e2e8802b875b5de8ee044ba1170345
2023-04-21 08:03:22 +00:00
Alf Eaton
98961d9465 Merge pull request #12719 from overleaf/ae-navbar
Restore z-index of .navbar-main

GitOrigin-RevId: f25b462227beaee483199043a97206ccdedfe1c0
2023-04-21 08:03:19 +00:00
Mathias Jakobsen
81a8fa2ce3 Merge pull request #12672 from overleaf/ae-emacs-compile-keydown
[cm6] Stop propagation of Ctrl-s when Emacs keybindings are enabled

GitOrigin-RevId: 32bebefb583ad813931af221cce7498d40fdbaf1
2023-04-21 08:03:11 +00:00
Mathias Jakobsen
462837b44d Merge pull request #12701 from overleaf/dk-cm6-autocomplete-item-space
[cm6] Add space after item autocomplete

GitOrigin-RevId: 6fff77c0c0563530af981bbac73b1d88e02bb759
2023-04-21 08:03:08 +00:00
Mathias Jakobsen
4341abcf64 Merge pull request #12678 from overleaf/mj-cm6-vim-upgrade
[cm6] Upgrade codemirror-vim

GitOrigin-RevId: 2f57c338a69c19bf6bd6525debd10e5e6eb1269f
2023-04-21 08:03:05 +00:00
Mathias Jakobsen
29b056d5a3 Merge pull request #12682 from overleaf/mj-def-whitespace
[lezer] Allow whitespace before macro parameter

GitOrigin-RevId: 14bd8428f0a78fb71184bf300dac0b2b1e3abd3c
2023-04-21 08:03:02 +00:00
Mathias Jakobsen
3bd174631a Merge pull request #12696 from overleaf/mj-rt-skip-more-preamble
[cm6+rt] Update skip-preamble-cursor to skip \maketitle and abstract

GitOrigin-RevId: 3c54d8159bfdb431763872790a2b82ac4cffc09f
2023-04-21 08:02:59 +00:00
Mathias Jakobsen
59b3b9b933 Merge pull request #12631 from overleaf/ae-readonly-focus
[cm6] Prevent the editor being focused when read-only

GitOrigin-RevId: 7de9f2df2421b57b3315d59d640f7c8b46caf178
2023-04-21 08:02:56 +00:00
Mathias Jakobsen
c2292a8567 Merge pull request #12677 from overleaf/ae-codemirror-view-upgrade
[cm6] Upgrade CodeMirror dependencies

GitOrigin-RevId: cc973b1c5b23eca0fc93a9b3a970c832212e47af
2023-04-21 08:02:53 +00:00
Rebeka
5ff575e3e5 fix: when collapsing the navbar, do not overlap it with other elements, for example with the tooltip
GitOrigin-RevId: 2db133ce8399c46b620a3a594fc415244c7d9788
2023-04-21 08:02:49 +00:00
Rebeka
4adf965180 fix: make the navbar dropdown list to take the full viewport
GitOrigin-RevId: c6c6c447c14fa25ad27d73cf3c39d6650fa5e744
2023-04-21 08:02:46 +00:00
Brian Gough
cb8992e912 Merge pull request #12709 from overleaf/bg-rollback-additional-services
rollback additional services from node 18 to 16

GitOrigin-RevId: 60428768eb4c895b89e9a5dace429ea70af3b9bf
2023-04-20 08:04:02 +00:00
Brian Gough
8d55ebc662 Merge pull request #12706 from overleaf/bg-rollback-broken-node-18-services
rollback broken node 18 services

GitOrigin-RevId: 7aa84d0cc864474d00fe881db100a4c6ec7d798c
2023-04-20 08:03:54 +00:00
Miguel Serrano
3f85b8732f Merge pull request #12642 from overleaf/msm-ce-update-node
Update CE/SP to Node 18

GitOrigin-RevId: 748ab26c1544eadf528c7f453391c04b56be4f7f
2023-04-20 08:03:46 +00:00
Brian Gough
ed0acd8e58 Merge pull request #12658 from overleaf/bg-node-18-upgrade
Upgrade to node 18

GitOrigin-RevId: 1b25d20a8987950a72a7bf966a825794de4ad960
2023-04-20 08:03:37 +00:00
Rebeka Dekany
df300b5f24 Fix: Chat messages deduplication (#12667)
* Prevent the duplicated message IDs by filtering them out

* fix: Prevent the duplicated message IDs by filtering them out

GitOrigin-RevId: 6d6c2821e6e29c9949fd323fa3a507016b51aff4
2023-04-19 08:03:31 +00:00
Tim Down
5f5e07a334 Merge pull request #12668 from overleaf/td-history-scroll-to-first-change
Scroll to first change in history document diff viewer

GitOrigin-RevId: e135877ca440c5eb2732890e8723d9098444727f
2023-04-19 08:03:28 +00:00
Tim Down
99e1ff0804 Merge pull request #12644 from overleaf/td-history-compare
Initial implementation of comparing history versions

GitOrigin-RevId: 890e270d6e41856a79689ab41ccfbde25c4703ba
2023-04-19 08:03:25 +00:00
Jessica Lawshe
df58f6720e Merge pull request #12609 from overleaf/jel-request-for-service-pdf
[web] Update Request for Service PDF

GitOrigin-RevId: 0a0598ba3549148a0314b65248f00d167ac62d0c
2023-04-19 08:03:22 +00:00
Jessica Lawshe
6fc5385ca6 Merge pull request #12249 from overleaf/tm-gallery-top-picks
Implement top picks in template gallery for CVs

GitOrigin-RevId: 22f720582e27fac2b9e454ce4e28bd124de094b7
2023-04-19 08:03:19 +00:00
Eric Mc Sween
5b804ceefd Merge pull request #12654 from overleaf/em-td-upload-filename-encoding
Fix filename encoding of project and file uploads

GitOrigin-RevId: e718c8f8f376772ee13c50c82d26848977e16eef
2023-04-19 08:03:13 +00:00
Eric Mc Sween
cff54eae78 Merge pull request #12575 from overleaf/em-fix-chunk-replace-transaction
Fix history chunk replacement transaction

GitOrigin-RevId: fc0fa8f4a55ae5f402ba87db5e4ac2856fe6627b
2023-04-19 08:03:10 +00:00
Alf Eaton
924012e21f [cm6] Avoid overwriting themed syntax highlighting colours when editing Markdown (#12648)
GitOrigin-RevId: ed5d558544839978862004a8b7feb80806a2100d
2023-04-19 08:03:04 +00:00
Alf Eaton
51a068b707 Merge pull request #12603 from overleaf/ae-make-all
Add "all" target to server-ce Makefile

GitOrigin-RevId: 9ca8fac603e28793490cc9b8dc3f86b96719e520
2023-04-19 08:02:59 +00:00
Alf Eaton
c91b092ba8 Merge pull request #12608 from overleaf/ae-link-dockerfiles
Link to the Dockerfile locations from the Community Edition README

GitOrigin-RevId: d182ced2ac9d51deb644e8729eed26af59bb5bc4
2023-04-19 08:02:56 +00:00
Alf Eaton
5717f51042 Merge pull request #12643 from overleaf/ae-initial-active-line-highlight
[cm6] Fix initial active line highlight

GitOrigin-RevId: 54de6a176e826ed7d7f1016ba6cee7a8803f0be4
2023-04-19 08:02:53 +00:00
Alf Eaton
f205d1f31d Merge pull request #12621 from overleaf/ii-history-react-delete-labels
[web] Delete history tags

GitOrigin-RevId: 0a2846bbb3e99ef632b9192a9f8c04f702645506
2023-04-19 08:02:47 +00:00
Jimmy Domagala-Tang
fd61e9b2b5 Merge pull request #12554 from overleaf/jdt-dev-google-sso-env-variable
local env variable for google sso contains trailing slash

GitOrigin-RevId: 3840cd794cda4870a10755a1d272221b314a6586
2023-04-18 08:05:23 +00:00
Jakob Ackermann
66d91dfd61 Merge pull request #12632 from overleaf/jdt-jpa-sso-notification-logging
[web] fallback to providerName when displaying SSO-linked notification

GitOrigin-RevId: 0da4a570f8a704cdbd47b5905a21273c6ab85d6d
2023-04-18 08:05:07 +00:00
Mathias Jakobsen
c8f7bc54bc [web] Add split test for testing editor switch naming (#12596)
Co-authored-by: Ieva Vaiginyte <95856891+ievaoverleaf@users.noreply.github.com>
GitOrigin-RevId: dafe07bda841dad962ebf2894718750fafe86373
2023-04-18 08:04:59 +00:00
Jimmy Domagala-Tang
77c2db38fc Merge pull request #12566 from overleaf/jdt-ghost-danger-buttons
feat: adding danger ghost buttons
GitOrigin-RevId: 2ee6ea1c395ba4a73fbe09b36acde3145c590a6b
2023-04-18 08:04:51 +00:00
Tim Down
b07535f15b Merge pull request #12641 from overleaf/td-source-editor-import-fix
Fix for incorrect import

GitOrigin-RevId: 5814fbf888446f7cbc9464565ab13f3b1db8b54f
2023-04-17 08:05:57 +00:00
Tim Down
23b9c078b8 Merge pull request #12636 from overleaf/td-history-autoselect-file
Simplify file autoselect in React history view

GitOrigin-RevId: 43f070b26ab0a75af13063712b5cf05778da4064
2023-04-17 08:05:49 +00:00
Tim Down
38998afa8e Implement history diff viewer buttons (#12439)
GitOrigin-RevId: 0ed8eb8568783b4938188a86c4ee75c767e6d713
2023-04-17 08:05:41 +00:00
Alf Eaton
63b2064420 [cm6] Add scrollIntoView when commands are dispatched (#11678)
GitOrigin-RevId: be005885330b9b29c7ddbfeacaec0a41d96e5e25
2023-04-17 08:05:33 +00:00
Mathias Jakobsen
7d237d0103 [cm6] Only swallow text in autocomplete insertion if node is well-formed (#12562)
* [cm6] Only swallow text in autocomplete insertion if node is well-formed

* [cm6] Use longest common prefix heuristic for autocompletion in ill-formed nodes

GitOrigin-RevId: 5adf3dc0314d86b267e2142a1250dece3ab29ef8
2023-04-17 08:05:24 +00:00
Mathias Jakobsen
73191f56e1 [cm6+rt] Make formatting commands work after UnknownCommands without arguments (#12625)
GitOrigin-RevId: 0eb59e6580d6f217c46424ede0fa6f79c8786940
2023-04-17 08:05:16 +00:00
Mathias Jakobsen
4b2cc907e2 [cm6] Change Emacs commands to visual-line-mode (#12523)
* [cm6] Change Emacs commands to visual-line-mode
* [cm6] Change line deletion commands to visual line mode

GitOrigin-RevId: 7a4f3d66bec611de410b6c1fbafbfe33b974e37b
2023-04-17 08:05:08 +00:00
Alf Eaton
e09a5f3adf Assert that the Rich Text document is ready before continuing with Cypress tests (#12612)
GitOrigin-RevId: fb0755200366e1129ee86ba9a439210ffe64e205
2023-04-17 08:04:59 +00:00
Alf Eaton
6ca565fa90 Fix autocomplete hotkeys description (#12607)
GitOrigin-RevId: f7f80fdf56f97ee70accec0162e6b395cfd16584
2023-04-17 08:04:51 +00:00
Alf Eaton
359255b820 [cm6] Use a modified fork of the closeBrackets extension (#12573)
GitOrigin-RevId: a24020ed216cb10defff989f5876666c29889de2
2023-04-17 08:04:43 +00:00
Alf Eaton
dda9230c6c [rich text] Add "Insert Citation" and "Insert Cross-reference" buttons (#12529)
GitOrigin-RevId: fde2f1a281318afede138ccae12f73ade3fa9f65
2023-04-17 08:04:34 +00:00
Alf Eaton
39df55787c Improve handling of doc:saved events (#12522)
GitOrigin-RevId: 0ebf198548f6aeecb356405b0c582d3fd64db391
2023-04-17 08:04:26 +00:00
Alf Eaton
a8ed6b65e1 [cm6] Improve "vertical overflow" handling (#12405)
* Avoid setting style on the editor view whenever overflowPaddingState changes
* Round values in recalculateScreenPositions
* Refactor ignoreGeometryChangesUntil slightly
* Restore the original value

GitOrigin-RevId: 75c57be21dd16a748c0d9b14058386849a80b831
2023-04-17 08:04:18 +00:00
Alf Eaton
ab10fd99f5 Add CodeMirror dev tools extension (#12142)
GitOrigin-RevId: 148a0fba5faf6dc8f638fcb4666e2fda6c5c6c40
2023-04-17 08:04:09 +00:00
Alf Eaton
161decd67d Upgrade @codemirror/view (#12574)
* Upgrade @codemirror/view
* Disable emptyLineFiller extension

GitOrigin-RevId: 57ce4194ece0ea448e24184f0b3a3e13352cb014
2023-04-17 08:04:00 +00:00