Commit graph

2328 commits

Author SHA1 Message Date
Miguel Serrano
c081db1ddf Merge pull request #3989 from overleaf/jel-reconfirm-tests
Fix reconfirm tests

GitOrigin-RevId: bbcaf97f339dc563a7b49db14252cc8de601878d
2021-05-06 02:09:29 +00:00
Miguel Serrano
4bcab34580 Merge pull request #3978 from overleaf/jel-notifications-decaf
Notifications decaf cleanup and remove eslint disable

GitOrigin-RevId: 557a7c63aecda346501d56d1eb18935b12130e8a
2021-05-06 02:09:25 +00:00
Miguel Serrano
219f9ec39e Merge pull request #3966 from overleaf/jpa-acceptance-tests-rate-limiter
[misc] replace RateLimiter unit tests with acceptance tests on /metrics

GitOrigin-RevId: c4ef502b38bb4b300c6b9812e1c97858e93a38fe
2021-05-06 02:09:22 +00:00
Miguel Serrano
f9871103bf Merge pull request #3949 from overleaf/msm-reenable-eslint-const-rule
Reenable eslint `prefer-const` rule

GitOrigin-RevId: 4f3825be8b8dff381095209085a36eaab76260d5
2021-05-06 02:09:14 +00:00
Shane Kilkelly
f1f8c4e152 Merge pull request #3965 from overleaf/ae-file-tree-popup
Use custom overlay for file tree dropdown menu

GitOrigin-RevId: 261b21953f9331427d6d368716662d7eaec65477
2021-05-01 02:13:14 +00:00
Shane Kilkelly
6893cce6c9 Merge pull request #3964 from overleaf/jpa-unique-project-name-with-year
[ProjectHelper] _addNumericSuffixToProjectName: add heuristic for year

GitOrigin-RevId: 24c57d68706bdabba620137674946e3c8e675939
2021-05-01 02:13:10 +00:00
Chrystal Maria Griffiths
3dfcb95802 Merge pull request #3960 from overleaf/cmg-binary-file
[BinaryFile] Reopening of Binary file React migration

GitOrigin-RevId: 050e66e3321bd6579d44932b669fc0a31df06d18
2021-04-29 02:09:38 +00:00
Jakob Ackermann
23c73b9bf1 Merge pull request #3959 from overleaf/jpa-take-note-of-past-url
[UnsupportedBrowserMiddleware] take note of the past URL in redirect

GitOrigin-RevId: d80ed876f87e54c181f00669a11795a2ce44e5a5
2021-04-29 02:09:33 +00:00
Jakob Ackermann
cf496e1fd2 Merge pull request #3958 from overleaf/jpa-script-delete-orphaned-docs-online
[scripts] add a script for deleting orphaned docs

GitOrigin-RevId: f3b16d900cc162852491bd7a83fe1ba61a0579d8
2021-04-29 02:09:29 +00:00
Jakob Ackermann
adfde7d26b Merge pull request #3950 from overleaf/msm-reenable-lint-prefer-regex-literals
Reenable `prefer-regex-literals` eslint rule

GitOrigin-RevId: 3c576d92a08dfcb745d447b1bf8c7b828753010d
2021-04-29 02:09:10 +00:00
Thomas
72af966c9c Schedule subscription downgrades to occur at the current term end (#3801)
* Schedule subscription downgrades to occur at the current term end.

If the plan is a downgrade, schedule the subscription change for term
end. Use Recurly v3 API subscription change event instead of v2 update
subscription.

* Add ability for user to revert a pending subscription change

In the case where a user has downgraded, but has since decided they'd
rather stay on their current plan, we need a way to let them revert. It
isn't enough to re-use a subscription change, because Recurly sees it as
an attempt to make a change from the current plan to itself.

Instead, we use a new dialog and call a new endpoint that has the
specific intent of reverting the pending plan change, by calling the
removeSubscriptionChange recurly client method.

* Add message prompting users to contact support for immediate changes

We're showing this in the confirmation modal for a plan change that
would occur in the future, and and on the subscription page if a pending
change is due.

Most users shouldn't need this, but it should help them out if they find
an edge case like moving from eg. Student (Annual) to Professional
(Monthly) and were expecting to be "upgraded" immediately.

GitOrigin-RevId: c5be0efbeb8568ed9caa941aadcef6f6db65c420
2021-04-28 02:10:31 +00:00
Alexandre Bourdin
affaae14b7 Merge pull request #3917 from overleaf/ab-example-project-ab-test
Example Project Split Test

GitOrigin-RevId: a9d68811c878e32b92e0547311c9e477e4096135
2021-04-28 02:10:08 +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
Jessica Lawshe
517485d7ea Merge pull request #3914 from overleaf/jel-graphs-cached-licenses
Use cached affiliation data

GitOrigin-RevId: b8ae2b871cc1f3a11e61dd449b4d1ddc7835860d
2021-04-27 02:09:28 +00:00
Chrystal Maria Griffiths
4e9d7c36ff Merge pull request #3952 from overleaf/revert-cmg-binary-file
Revert "Merge pull request #3526 from overleaf/cmg-binary-file"

GitOrigin-RevId: 5f539f26992fefd01b07922b1f43a3a3bc753141
2021-04-24 02:10:12 +00:00
Eric Mc Sween
1186c3e9a4 Merge pull request #3526 from overleaf/cmg-binary-file
[BinaryFile] Binary file React migration

GitOrigin-RevId: e229ad8ec3781607b5ca28387927b84d4af95060
2021-04-24 02:10:07 +00:00
Alasdair Smith
f33c00f2fd Merge pull request #3944 from overleaf/revert-3943-revert-3735-as-chat-reducer
Re-do Refactor chat store to use React state

GitOrigin-RevId: 626e3379ddb2f75680742df8957fbe350ba89881
2021-04-24 02:10:01 +00:00
Alasdair Smith
b3b8502e5e Merge pull request #3943 from overleaf/revert-3735-as-chat-reducer
Revert "Refactor chat store to use React state"

GitOrigin-RevId: e75e2d56a80c3741415bea3941a26f7dd8f505d3
2021-04-23 02:09:59 +00:00
Alasdair Smith
bb4523b7f6 Merge pull request #3735 from overleaf/as-chat-reducer
Refactor chat store to use React state

GitOrigin-RevId: 800a21c3c8a5c3c628c0a13bcb091675d1fb6f25
2021-04-23 02:09:54 +00:00
Shane Kilkelly
07ec567b07 Merge pull request #3902 from overleaf/sk-ref-providers-hide
Editor: don't leak encrypted tokens to frontend
GitOrigin-RevId: 245c1e9d479f7eec2979b46a5959bd3eb9f08363
2021-04-22 02:09:31 +00:00
Jakob Ackermann
58fbbf6269 Merge pull request #3925 from overleaf/jpa-cache-deleted-project
[scripts] back_fill_dummy_doc_meta: add a cache for deletedProjects

GitOrigin-RevId: 3d24c9fc4985f33b2e18f8f63f0b690d65476d1b
2021-04-21 02:09:23 +00:00
Jakob Ackermann
35e9d4ea0b Merge pull request #3923 from overleaf/ta-format-fix
Fix formatting after Prettier 2 upgrade

GitOrigin-RevId: c06462c321f8586e442710e9a1186b3643ae6153
2021-04-20 02:10:25 +00:00
Timothée Alby
0ecebefb0c Merge pull request #3804 from overleaf/msm-react-publish-button
[ReactNavigationToolbar] Submit button

GitOrigin-RevId: 9b40e09f001b44bd2f5035469f0d0c852fea7199
2021-04-20 02:10:19 +00:00
Timothée Alby
f7166c5c1b Merge pull request #3922 from overleaf/jpa-fix-project-restore-deleted-files
[ProjectDeleter] undeleteProject: deletedFiles.projectId is an ObjectId

GitOrigin-RevId: 53bdc7c2a20269ef22ec7ca55a6ccf9339209cdd
2021-04-20 02:10:14 +00:00
Timothée Alby
97f89f132c Merge pull request #3920 from overleaf/as-fix-unsupported-middleware
Fix unsupported browser middleware

GitOrigin-RevId: 27dc8cef4747abba85a985c28865340bc5116ab7
2021-04-20 02:10:05 +00:00
Timothée Alby
5520553e34 Merge pull request #3877 from overleaf/jpa-script-regenerate-referreal-ids-optimize-queries
[scripts] regenerate_duplicate_referral_ids: optimize queries, add tests

GitOrigin-RevId: 5b6881b857b20a80bc8db6e01fb7668dc0377675
2021-04-20 02:09:59 +00:00
Jakob Ackermann
e47237f350 Merge pull request #3915 from overleaf/jpa-script-back-fill-dummy-doc-meta
[scripts] back_fill_dummy_doc_meta: bug fixes and limit result size

GitOrigin-RevId: 6823cf626ba7e0e6733a317866512745bb1e5206
2021-04-16 02:05:36 +00:00
Jakob Ackermann
4f8a905e9b Merge pull request #3909 from overleaf/jel-reconfirm-email-template
Add reconfirm email template

GitOrigin-RevId: 2488c79c25a7148f601e3e3e2021cdbee4be7b4c
2021-04-16 02:05:33 +00:00
Jakob Ackermann
b276587c42 Merge pull request #3911 from overleaf/ae-share-modal-link-sharing
Only use project sharing data from the websocket connection

GitOrigin-RevId: 4549a6379dfebb00581ca4ddf276654fbbb3701d
2021-04-16 02:05:24 +00:00
Jakob Ackermann
70841f4b3b Merge pull request #3907 from overleaf/jpa-script-back-fill-dummy-doc-meta
[scripts] add a new script for back filling dummy doc meta data

GitOrigin-RevId: d3cb0900f08d4d3264cb1e8a0b3f7e8acdd6eb6c
2021-04-16 02:05:21 +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
Alasdair Smith
c89beb7657 Merge pull request #3905 from overleaf/jel-analytics-licence-api
Proxy analytics request to v1

GitOrigin-RevId: 82bcca52d096b8a9bc590f0ee0a0d3a6054e294e
2021-04-15 02:05:12 +00:00
Shane Kilkelly
04fa863f9f Merge pull request #3892 from overleaf/sk-reroll-csrf
Regenerate CSRF token on login

GitOrigin-RevId: 501582b34794a822f4c9fe3af2575b5756511e06
2021-04-10 02:05:13 +00:00
Shane Kilkelly
f013f33c05 Merge pull request #3884 from overleaf/jpa-meta-editor-take-2
[misc] migrate the editor templates to meta tags -- take 2

GitOrigin-RevId: 447d4c6c2197dd2c5f5e182a5edf57313557b8b9
2021-04-10 02:05:05 +00:00
Jessica Lawshe
66105d6937 Merge pull request #3782 from overleaf/revert-3773-revert-3718-jel-emailHasLicence
Revert "Revert "Update emailHasLicence for reconfirmation and SAML""

GitOrigin-RevId: 120ee0ca2f59573578e6279477c6e62972b5fb4a
2021-04-09 02:05:17 +00:00
Brian Gough
11b4d91d9e Merge pull request #3883 from overleaf/bg-expire-tokens
expire tokens from mongo

GitOrigin-RevId: 5666fd40d04e122f2bc2a22bff24c0723e1e9a73
2021-04-08 02:05:04 +00:00
Jakob Ackermann
ec7cd9fc3e Merge pull request #3656 from overleaf/jpa-script-back-fill-doc-name
[scripts] add new script for back filling the names of deleted docs

GitOrigin-RevId: c3a7ad8ba1306728bc1a433bec5dc847651bf94d
2021-04-07 02:05:03 +00:00
Jakob Ackermann
76b1cdff51 Merge pull request #3754 from overleaf/jpa-project-restore-handle-deleted-docs
[ProjectDeleter] restore project.deletedDocs meta data into docstore

GitOrigin-RevId: 570543d2cb9c5c790ac49328382ed88ef6ac3129
2021-04-07 02:05:00 +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
75dabdd299 Merge pull request #3881 from overleaf/jpa-fix-unit-test
[misc] fix a unit test

GitOrigin-RevId: 22bd33a8c7c4311d8f22881a42e387190aa7c6e7
2021-04-07 02:04:55 +00:00
Jakob Ackermann
3bdf7afbbf Merge pull request #3653 from overleaf/jpa-merge-deleted-docs-sources
[EditorHttpController] fetch deletedDocs from docstore, merge w/ project

GitOrigin-RevId: 5cf46aa7ded034285051ddae21b5c80d8c806693
2021-04-07 02:04:52 +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
Thomas
eb46f9a738 Merge pull request #3880 from overleaf/revert-3826-jpa-meta-editor
Revert "[views] migrate the editor templates to meta tags"

GitOrigin-RevId: 02caaf24ae0ee6a74a38ef870909527da19d4882
2021-04-02 02:05:02 +00:00
Jakob Ackermann
23be656aec Merge pull request #3746 from overleaf/jpa-hard-deletion-from-deleted-files
[ProjectDeleter] hard deletion of project deletes deletedFiles entries

GitOrigin-RevId: b514c34465d5fdc66b40aae5bcdb8b66975bc350
2021-04-02 02:04:58 +00:00
Shane Kilkelly
ae212feec4 Merge pull request #3701 from overleaf/jpa-script-back-fill-deleted-files-stage-2
[scripts] back_fill_deleted_files: optionally fix partial inserts

GitOrigin-RevId: 7d48d311db1af0b38222725ca86cdba8951b16b3
2021-04-02 02:04:52 +00:00
Miguel Serrano
f9962fefe8 React git-bridge modal (#3869)
GitOrigin-RevId: 5b2609ed9ad7909a10cb08342053e955447688f5
2021-04-01 02:06:05 +00:00
Brian Gough
1d30feecaf Merge pull request #3855 from overleaf/bg-skip-metadata-for-single-user
skip metadata broadcast for single user

GitOrigin-RevId: 4277870615aea1b07e1a8db6a26956be3661a443
2021-04-01 02:05:55 +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
Alf Eaton
5653116cdb Reset the "select collaborators" combobox when needed (#3821)
GitOrigin-RevId: 773ea3ff01d2b6ec058728430174b77fadc481c8
2021-04-01 02:05:41 +00:00
Alf Eaton
d0d28524a2 Switch to useScopeValue for project data in Share modal (#3823)
GitOrigin-RevId: f82170c241c59cf7b66fea7e1471004e46ab3547
2021-04-01 02:05:30 +00:00