github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity
10042 commits 3 branches 7 tags 206 MiB
Commit graph

5804 commits

Author SHA1 Message Date
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
c5a1368d30 Merge pull request #3953 from overleaf/jel-reconfirm-thank-you 
Reconfirm UI translation

GitOrigin-RevId: 3dea8abb20763813ea5f1d372269b2b97a9c9747
 2021-04-27 02:09:32 +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
Alf Eaton
ff62a7e63c Enable React add files modal for all users (#3941) 
GitOrigin-RevId: 923bf41a8c5e9f0932a1711530446dfd5c8d0d7f
 2021-04-23 02:10:09 +00:00
Alf Eaton
5cec4420dc Merge pull request #3940 from overleaf/ae-share-modal-for-everyone 
Enable React share modal for all users

GitOrigin-RevId: 2cb288e15770d3169034e4511df6537d010e924d
 2021-04-23 02:10:05 +00:00
Alf Eaton
2621a1d5bb Merge pull request #3933 from overleaf/ae-csp-report-percentage 
Add CSP_REPORT_PERCENTAGE

GitOrigin-RevId: 4afde0da6e3660c83df8c5c9cd31a3f246e9e572
 2021-04-22 02:09:40 +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
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
7d0f117918 Merge pull request #3919 from overleaf/jpa-refactor-inline-script 
[views] referal/bonus: refactor inline script in event handler

GitOrigin-RevId: 825f15c1badf964e0e0e2c9bc42951a5f318b357
 2021-04-20 02:10:10 +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
Alf Eaton
dcd6bd347f Use the full (relative) view path for CSP exclusion (#3916) 
GitOrigin-RevId: f6828a447abcc550f0c7dfd0fc6fc72f4b5b1f7e
 2021-04-17 02:09:56 +00:00
Alasdair Smith
f7cf7626ec Merge pull request #3820 from overleaf/as-block-ie 
Add middleware to block unsupported browsers

GitOrigin-RevId: b1f1e4ae1572c3c323dc72442c8d5169b4879d5d
 2021-04-17 02:09:52 +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
78326fb352 Merge pull request #3903 from overleaf/as-clean-up-error-pages 
Clean up error pages

GitOrigin-RevId: 764375124ef5349c97416339119471a166d727b5
 2021-04-16 02:05:30 +00:00
Jakob Ackermann
d2e6449e79 Merge pull request #3897 from overleaf/tm-meta-tags-billing 
[views] migrate subscription templates to meta tags, re-issue

GitOrigin-RevId: c18bb7c96186cc8c34344ecf7cee35f9da19698e
 2021-04-16 02:05:27 +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
676b70b2be Merge pull request #3899 from overleaf/ae-csp-report-sample 
Add 'report-sample' to script-src CSP directive

GitOrigin-RevId: 1a2c26339e7ef353a89fc264b0f186a1d313e1bc
 2021-04-15 02:05:16 +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
Alasdair Smith
93492bb25a Merge pull request #3908 from overleaf/jel-reconfirm-ui-meta-tags 
Meta tag migration for reconfirm UI

GitOrigin-RevId: b0bda07acc5389b1d5ef4e9ea3d10688ac26f0a0
 2021-04-15 02:05:09 +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
16d02c9d8b Merge pull request #3882 from overleaf/ab-wfh-ga-events 
Add new GA events to WFH2021 links

GitOrigin-RevId: 939f589c359a97b794eceb8e493cccd95ec1913a
 2021-04-10 02:05:09 +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
2fca78eaf0 Merge pull request #3896 from overleaf/revert-3834-tm-meta-tags-billing 
Revert "[views] migrate subscription templates to meta tags"

GitOrigin-RevId: 8ab3dae6e3aa359b6d7aa69df70a1b1eb2405dfd
 2021-04-09 02:05:33 +00:00
Jessica Lawshe
e697064f16 Merge pull request #3834 from overleaf/tm-meta-tags-billing 
[views] migrate subscription templates to meta tags

GitOrigin-RevId: 4e81e81380048436a011467c230cc54c02e0c423
 2021-04-09 02:05:29 +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
Miguel Serrano
42a1211ba7 Merge pull request #3888 from overleaf/jpa-hotfix-soft-failure-for-missing-deleted-docs 
[EditorHttpController] joinProject: ignore err when fetching deletedDocs

GitOrigin-RevId: e2e2e5172de04cebb4a951739ac4222645fdd289
 2021-04-08 02:05:07 +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
Hugh O'Brien
0aba0300d1 GitHub sync modal react port (#3711) 
* GH-sync React - initial left menu github sync react skeleton

* GH-sync modal main switching logic setup and free trial mode

* GH-sync react - message for link sharing users

* GH-sync react: link gh account from modal

* GH-sync React: add export to github form modal

* GH-sync react: display commits and merge buttons

* GH-sync react: merge logic

* GH-sync React: merge endpoint error handling

* GH-sync React: update error handling to new fetch behaviour

* GH-sync React: handle ignoring external updates

* GH-sync React: main switcher modal tests

* GH-sync React: tests for export and merge

* GH-sync react: error handling and error boundary

* GH-sync React: put behind alpha flag

* GH-sync React: re-adding translations lost in rebase and cleanup

* GH-sync React: use renderWithEditorContext for tests and replace missing translations

* GH-sync React review code cleanup
GH-sync React fix state ordering causing errors

GitOrigin-RevId: 37261966683112b399ef180ec6bc4036bc689fd9
 2021-04-07 02:05:06 +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
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
b9b4ca224c Merge pull request #3862 from overleaf/tm-remove-comms-introducing-archiving 
Remove comms which introduced per-user archiving and trashing

GitOrigin-RevId: e8bd7bd741fe25f4530f447cf020b499256745dc
 2021-04-02 02:04:49 +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
5587de9cf5 Merge pull request #3833 from overleaf/em-meta-tags 
Pass values to JS through meta tags

GitOrigin-RevId: f663a1b7fef4544b560574d21f59fdabaf617830
 2021-04-01 02:05:44 +00:00
Alf Eaton
be804b5fc1 Merge pull request #3832 from overleaf/ae-modal-beta 
* Add BetaBadge component
* Add beta_badge_tooltip translation
* Add beta badge to modal headers
* Enable Share and Add Files modals for beta users

GitOrigin-RevId: df0933830a0745c0ecf57db34f2cb75104a570cd
 2021-04-01 02:05:38 +00:00
Alf Eaton
a2be1f8981 Check that error.info exists (#3865) 
GitOrigin-RevId: 83c575cc3b94d9d6564d4a2919f81e7b47a116cc
 2021-04-01 02:05:35 +00:00
Alf Eaton
8227e68aca Improve form "for" and "autocomplete" attributes (#3822) 
GitOrigin-RevId: 2ce35d57526fc36b5a974d0f940ef6ba08806864
 2021-04-01 02:05:32 +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
Miguel Serrano
13bf8dad2b Merge pull request #3860 from overleaf/jpa-cleanup-layout 
[views] drop a hack that blocked 3rd party software from loading in 2015

GitOrigin-RevId: c6a26e05d12e3a02669a05d40a9f3562d780eead
 2021-04-01 02:05:12 +00:00
Miguel Serrano
454d9790ca Merge pull request #3828 from overleaf/jpa-meta-project-dash 
[views] migrate the project dashboard to meta tags

GitOrigin-RevId: 934a9a64ca8668e8982caa7a945b1a55c87cb1ee
 2021-04-01 02:05:10 +00:00
Miguel Serrano
eeb2b7d18b Merge pull request #3826 from overleaf/jpa-meta-editor 
[views] migrate the editor templates to meta tags

GitOrigin-RevId: 01745172840c8ceb5fb9947ca6c14e919e9c4ac7
 2021-04-01 02:05:07 +00:00