Commit graph

2630 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Miguel Serrano
d65db1acf0 Merge pull request #3824 from overleaf/jpa-password-reset-email-forwarding
[misc] fix passing around of users email as part of password reset

GitOrigin-RevId: 54e8cde9867a2ce735bc7ebe281ead19ef49e6cd
2021-04-01 02:05:04 +00:00
Simon Detheridge
12f3e8d6bb Merge pull request #3847 from overleaf/ae-user-select-out-of-sync
Display the Out Of Sync modal file contents in a readonly textarea

GitOrigin-RevId: b91ff3ad32c3ed07987858e83571887ae356f4f3
2021-03-31 02:05:42 +00:00
Simon Detheridge
3d48e1e027 Merge pull request #3799 from overleaf/tm-past-due-invoice-warning
Show warning if users Recurly account has past due invoices.

GitOrigin-RevId: 8c501e7e561b201a3a184923c0681d67049464a9
2021-03-31 02:05:33 +00:00
Jakob Ackermann
b532833466 Merge pull request #3842 from overleaf/jpa-persistent-navigation-between-tabs
[views] admin: persist the navigation between tabs into the URL

GitOrigin-RevId: 202793b9d0b17934bb952e0283228603e036dbc9
2021-03-31 02:05:22 +00:00
Jakob Ackermann
ce2b7f7858 Merge pull request #3846 from overleaf/cmg-tracked-changes-whitespace
Add the space back into tracked-changes entry

GitOrigin-RevId: 2f1451c1dbeda393bc6a9ad12434e10755bff86d
2021-03-31 02:05:17 +00:00
Jakob Ackermann
c47f756d2c Merge pull request #3841 from overleaf/hb-restore-linked-file-errors
put back refreshFile errors for linked files

GitOrigin-RevId: aca36443a7d9ee37ae810ff02575489b3aaf0419
2021-03-31 02:05:13 +00:00
Jakob Ackermann
60cefae09a Merge pull request #3836 from overleaf/jpa-no-close-editor-in-saas
[views] admin: the open/close editor feature is not available in SAAS

GitOrigin-RevId: 6d9ba22e7843be7c27084a6bb5bc1c502ecdccc9
2021-03-31 02:05:07 +00:00
Alf Eaton
a69f7af055 Improve CSS chunk importing (#3817)
* Move ide.css to editor.pug
* Import angular-csp.css

GitOrigin-RevId: e0f4792690567e785e124d742e0332ddcf1155e6
2021-03-30 02:05:17 +00:00
Jakob Ackermann
deca5f3b0d Merge pull request #3810 from overleaf/jpa-meta-tag-user-sessions
[views] user/sessions: refactor window assignment into meta tag

GitOrigin-RevId: a5b07ccc99021b2c72a5888b9a9d28c1c458e1e9
2021-03-27 03:05:13 +00:00
Alf Eaton
a5637651b5 Add Content-Security-Policy header (#3783)
* Add Content-Security-Policy header
* Add nonce attribute to script tags
* Use source-map for webpack devtool
* Add ng-csp attribute when CSP is enabled
* Allow overriding CSP settings with environment variables
* Hook into render and allow routes to disable the CSP header

GitOrigin-RevId: a873736a3514198165f1b2f1e18d002b65f20d30
2021-03-26 03:04:55 +00:00
Alf Eaton
116f167a6f Merge pull request #3813 from overleaf/ae-user-has-feature-follow-up
Fix React attributes for Add Files modal

GitOrigin-RevId: 8254cdd14accdd8ead710d75a3ad4df75fc05134
2021-03-26 03:04:52 +00:00
Alf Eaton
974fe8fd39 Remove optional hyphens from pug templates (#3788)
GitOrigin-RevId: 2d31719a6aaefb85bba323d65ed66bdb06ec8928
2021-03-25 03:05:05 +00:00
Alf Eaton
54e6053cf9 Fix some aria-hidden attributes (#3790)
GitOrigin-RevId: a48086c01abd937b2e03ced38e8baf6c67753f56
2021-03-25 03:05:01 +00:00
Alf Eaton
ee79728bf9 Only check a user's features for importing from reference provider (#3797)
GitOrigin-RevId: cc5a36be20c673f8941a2694eaeba80eebb4db6a
2021-03-25 03:04:57 +00:00
Paulo Jorge Reis
3f0e897e32 Logs UI variant without popup (#3794)
* Add logs UI without pop-up variant

* Implement frontend for logs UI without pop-up

* Add logs UI variants to admin panel and front user info

* Fix existing UI subvariant window global

GitOrigin-RevId: 075db56032354d782e489b5235925f55b1a67e0b
2021-03-24 03:04:41 +00:00
Jakob Ackermann
535c97e8cf Merge pull request #3774 from overleaf/jpa-meta
[frontend] import meta tag processing from das7pads fork

GitOrigin-RevId: ca74ff9fbbcb51091a626a45468ff3d24d6136ca
2021-03-23 03:05:12 +00:00
Paulo Jorge Reis
15f49994bd New compile UI autocompile (#3762)
* Animate recompile button when autocompile is waiting

* Add code-check failed notice to the new compile UI

GitOrigin-RevId: 83b62f41438e8e5b94bd893c222bec37745c0f57
2021-03-19 03:04:50 +00:00
Alf Eaton
ba4300d9e1 Merge pull request #3518 from overleaf/ae-react-create-file-modal
Migrate "Add Files" modal to React

GitOrigin-RevId: fc5235108ee65294e3176da9c327791c34aa5b3c
2021-03-19 03:04:46 +00:00
Jakob Ackermann
1e2ed05bed Merge pull request #3760 from overleaf/jpa-xss-5
[views] mitigate Angular XSS on new project from template POST gateway

GitOrigin-RevId: a19de060cad0baf2822d1b6df419bbe1a2361ea4
2021-03-18 03:04:54 +00:00
Jakob Ackermann
f353728bda Merge pull request #3755 from overleaf/jpa-xss-2
[views] mitigate Angular XSS via email/new_email

GitOrigin-RevId: 3d127c283ba9f97c5b0e6c53a9d77f7f597058bb
2021-03-18 03:04:50 +00:00
Jakob Ackermann
7609b741fa Merge pull request #3768 from overleaf/jpa-xss-10
[views] mitigate Angular XSS on password reset page

GitOrigin-RevId: 65f423fcb1a3afff0f396bb8e173d1e1bcff056a
2021-03-18 03:04:45 +00:00
Jakob Ackermann
8766c23abb Merge pull request #3767 from overleaf/jpa-xss-9
[views] mitigate Angular XSS in email confirmation post gateway

GitOrigin-RevId: 11cd752d520054e448b3eeea431fe27f3c02fa00
2021-03-18 03:04:41 +00:00
Jakob Ackermann
115fe20184 Merge pull request #3766 from overleaf/jpa-xss-8
[views] mitigate Angular XSS in affiliations section of user settings

GitOrigin-RevId: bad444cea136c51f54546770653f21cec6fa70e3
2021-03-18 03:04:38 +00:00
Jakob Ackermann
58841ecbe9 Merge pull request #3765 from overleaf/jpa-xss-6
[views] mitigate Angular XSS in subscription dashboard

GitOrigin-RevId: 4ac0c431d520957aabd53436ae29a30c2aef3870
2021-03-18 03:04:34 +00:00
Jakob Ackermann
18eea6d024 Merge pull request #3763 from overleaf/jpa-xss-7
[views] mitigate XSS on new subscription page

GitOrigin-RevId: 74baa58527aa9b2f9e434c280885b627f73898b6
2021-03-13 03:05:14 +00:00
Alf Eaton
d9576189a3 Merge pull request #3636 from overleaf/ae-share-modal-split
Migrate Share modal to React

GitOrigin-RevId: 96a52df6ffd751cfcca2bbb68eb9e7a6dc31ff28
2021-03-13 03:05:10 +00:00
Miguel Serrano
a555f0d309 [ReactNavToolbar] Project name + pdf and share project buttons (#3709)
* Added project name, pdf toggle and share project buttons to navigation toolbar

* Added PropTypes check to `useChatContext()`

* React context updates for project name/rename, pdf view and share moda

* Hide PDF button when pdfLayout != 'flat'

GitOrigin-RevId: 3f4a1b072259df7148d3417cd22116702bdd79ac
2021-03-11 03:05:33 +00:00
Alexandre Bourdin
8001e55b88 Merge pull request #3716 from overleaf/ta-tried-to-confirm-saml
Show Descriptive Error Mesage When Trying To Confirm SAML Email

GitOrigin-RevId: bb816d3774c18f2952851affb1f8d7c174570ba1
2021-03-11 03:05:08 +00:00
Thomas
fc4f71a0c0 Merge pull request #3704 from overleaf/jel-reconfirm-disable-btn
Disable "Make Primary" button when reconfirmation needed

GitOrigin-RevId: df821185ce84c64ed1a8f4d413dd35ef18aa9e0c
2021-03-09 03:04:43 +00:00