Commit Graph
36 Commits
Author SHA1 Message Date
ThomasandCopybot 85adea3f50 Merge pull request #5382 from overleaf/tm-analytics-project-create-segmentation
Fix for project-created event segmentation data

GitOrigin-RevId: 5b8eb14a4ea03e7136c529742a183291557d2715
2021-10-08 08:03:04 +00:00
ThomasandCopybot d984e3d826 Project history upgrade script for None without SL history (#4814)
GitOrigin-RevId: 604fb8a8193b798be1a342af5f08c004eee5521b
2021-10-08 08:03:00 +00:00
ThomasandCopybot 3361ccfec1 Merge pull request #5123 from overleaf/tm-history-script-await-fix
Add missing await in history scripts

GitOrigin-RevId: 992e6748bc270845282853db6ec1a7aa496115ea
2021-09-24 08:04:08 +00:00
ThomasandCopybot 895f52d41a Let users upgrade to group plans via subscription dashboard (#5100)
* Let users upgrade to group plans via subscription dashboard

Users on an individual plan don't have a way to upgrade to a group
subscription without contacting support. As a temporary measure, we're
adding a way to do this by re-using the existing group plan modal from
the plans pages, to allow users to configure and upgrade to a group plan
directly.

This is currently only available for USD, EUR, and GBP - since although
we now support other currencies in Recurly, the group plans modal does
not yet support them. The user however can not change currency here,
their group subscription will be in the same currency as their current
individual subscription.

The group plan modal has been duplicated rather than extended, to keep
this code seperate as it is potentially only a stopgap measure - and we
don't want to be untangling the additional logic from the existing
modal/template later down the line.

GitOrigin-RevId: 10664bd19af2c3870dfe7e19fd0f9c5b7c877cc6
2021-09-15 08:04:00 +00:00
ThomasandCopybot 8ec01f59da Revert "Let users upgrade to group plans via subscription dashboard (#4704)" (#5047)
This reverts commit f310eb10ef00d43076981589ee45893e7d9ab881.

GitOrigin-RevId: 63d884d60d63b9ad47ffc15f688dc81fc7c3d77a
2021-09-10 08:04:24 +00:00
ThomasandCopybot 5f550b0a11 Let users upgrade to group plans via subscription dashboard (#4704)
Users on an individual plan don't have a way to upgrade to a group
subscription without contacting support. As a temporary measure, we're
adding a way to do this by re-using the existing group plan modal from
the plans pages, to allow users to configure and upgrade to a group plan
directly.

This is currently only available for USD, EUR, and GBP - since although
we now support other currencies in Recurly, the group plans modal does
not yet support them. The user however can not change currency here,
their group subscription will be in the same currency as their current
individual subscription.

The group plan modal has been duplicated rather than extended, to keep
this code seperate as it is potentially only a stopgap measure - and we
don't want to be untangling the additional logic from the existing
modal/template later down the line.

GitOrigin-RevId: f310eb10ef00d43076981589ee45893e7d9ab881
2021-09-10 08:04:18 +00:00
ThomasandCopybot deca6f1f93 Add script to upgrade v1 project histories (if created after full project history enabled) (#4712)
GitOrigin-RevId: b329b83ae4167c3c58b947936d6a460f6f2b4327
2021-08-27 08:03:46 +00:00
ThomasandCopybot 77bcd4c39e Revert "Initialise full project history for old projects when project opened (#4687)" (#4740)
This reverts commit ac263dca8cf0d80186fee916a76e5572ec5649d4.

GitOrigin-RevId: cc82e9c7d51966a7be0e8bef06ae4afe3f73170c
2021-08-13 12:59:04 +00:00
ThomasandCopybot 7517a818b2 Initialise full project history for old projects when project opened (#4687)
* Initialise full project history for old projects when project opened

This begins a second attempt at initialising the full project history in
the background for projects without a full project history id.

The original web-internal#4345 was reverted in web-internal#4353. This
commit reverts the revert, and adds an additional flush of the project
before initialising full project history.

GitOrigin-RevId: ac263dca8cf0d80186fee916a76e5572ec5649d4
2021-08-13 12:58:56 +00:00
ThomasandCopybot e25d8b1440 Merge pull request #4381 from overleaf/tm-history-upgrade-batched-update-hints
Extend batchedUpdate to accept find() options, and use a hint in upgrade script query to suggest mongo uses the _id index

GitOrigin-RevId: 7115f84d8be0c78ccb443051e911c931bf4aa0de
2021-08-05 02:08:07 +00:00
ThomasandCopybot ebc80fed8a Add script to upgrade v1 project histories (if no SL history) (#4364)
* Add script to upgrade v1 project histories (if no SL history)

GitOrigin-RevId: 997308eec2ed09be4d9d203cb746ca8ac8c88e23
2021-08-04 02:05:35 +00:00
ThomasandCopybot a84cf5f53b Revert "Initialise full project history for old projects (in background) when project opened (#4345)" (#4353)
This reverts commit 2da493c6023b362ced197b0533fa684c654a3827.

GitOrigin-RevId: b11dfff5cce1070c6b8113dc0988fae9ade0d39b
2021-07-29 02:05:23 +00:00
812b4b549f Initialise full project history for old projects (in background) when project opened (#4345)
Co-authored-by: Brian Gough <brian.gough@overleaf.com>
GitOrigin-RevId: 2da493c6023b362ced197b0533fa684c654a3827
2021-07-28 12:36:31 +00:00
ThomasandCopybot b03a4cf7fc Add script to count project history states (#4328)
GitOrigin-RevId: 9f5fce9e162140579841cdad8a2ebb168dde72af
2021-07-28 02:06:24 +00:00
ThomasandCopybot 35ee137067 Create migration to add history display state index (#4335)
GitOrigin-RevId: 26a03c0192ae673110bfa65e0b293c586dc4958a
2021-07-28 02:06:20 +00:00
f6c6a06b80 Upgrade passport-saml to overleaf fork of 3.0.0 and xml-crypto to 2.1.2 (#4190)
* Use overleaf fork of passport-saml and remove existing monkey patch

* Update xml-crypto to 2.1.2

* New way of loading MultiSamlStrategy

* Rename privateCert privateKey

* Add promisified SAML Cache Provider functions for passport-saml 3.0.0

* Remove test which checked xml-crypto version for old patch

* Sign mock SAML responses with test saml-key and provide saml-cert to test settings

* Decaffeinate createMockSamlResponse.js

* Add (unused) cert property to SAML config for metadata endpoint

Removes non-needed `cert` property from `settings.test.js`

* Allow SAMLManager to accept either privateKey or privateCert (legacy) config keys

Co-authored-by: Christopher Hoskin <christopher.hoskin@gmail.com>
GitOrigin-RevId: bdb9d1c9bf72a7fbf60c0b2afa9068e7a8c147d3
2021-07-06 02:05:50 +00:00
ThomasandCopybot be73463e35 Merge pull request #4248 from overleaf/tm-ta-new-subscription-currency-fixes
Fix getCurrencyCode behavior and add fallback in frontend for invalid currencies

GitOrigin-RevId: 5cc40b524148f88c0f110d2cf4bb4d3b69844f1b
2021-06-24 02:07:14 +00:00
d56d4c3b4a Add HTTP Basic Auth to Recurly webhook endpoint (#4054)
* Add HTTP authentication to Recurly webhook endpoint

Co-authored-by: Eric Mc Sween <eric.mcsween@overleaf.com>
GitOrigin-RevId: 81c32459d643895c096bc195ae6aef53248418da
2021-06-09 02:05:31 +00:00
ThomasandCopybot f7fd2dec65 Merge pull request #3503 from overleaf/cmg-downgrade-group-subscription
Downgrade group subscription properly

GitOrigin-RevId: 6d028b79f8d5cc1ae9257e72b12d06190fed4121
2021-05-18 02:08:24 +00:00
ThomasandCopybot 682abe9ca5 Merge pull request #3980 from overleaf/tm-show-error-if-plan-change-fails
Show error in plan change modal if plan change fails

GitOrigin-RevId: 698aab43feacdb5ced41f239167c5d132f7ca8de
2021-05-18 02:08:20 +00:00
ThomasandCopybot f7b96e86a7 Merge pull request #4034 from overleaf/tm-pending-subscription-addons
Display correct information when pending subscription has addons

GitOrigin-RevId: 7634ccf24788951507963b6d421fdb86e0dc38d5
2021-05-18 02:08:16 +00:00
ThomasandCopybot d2dad0d802 Merge pull request #4011 from overleaf/tm-fix-group-plan-educational-discount-text
Lowercase 'educational' for consistency in group plan modal text

GitOrigin-RevId: 139549dc96e71295f1eb5949fad66af1b4df4e16
2021-05-08 02:10:15 +00:00
ThomasandCopybot 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
ThomasandCopybot 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
ThomasandGitHub a7a3e9566c Merge pull request #211 from overleaf/tm-mute-project-id-error
Lower log level of 'no project_id found on client' messages
2021-03-31 10:35:01 +02:00
ThomasandCopybot 001f7f0cc2 Merge pull request #3773 from overleaf/revert-3718-jel-emailHasLicence
Revert "Update emailHasLicence for reconfirmation and SAML"

GitOrigin-RevId: 637b85d10fc0c79e8d55e51b43952e956d73baa6
2021-03-16 03:04:44 +00:00
ThomasandCopybot fee245b570 Merge pull request #3732 from overleaf/tm-recurly-create-admin-link
Create link to Recurly in admin panel

GitOrigin-RevId: 214802e9fbe16954d455ac04eb176ff27890769c
2021-03-16 03:04:40 +00:00
ThomasandCopybot 1c54a15e42 Merge pull request #3718 from overleaf/jel-emailHasLicence
Update emailHasLicence for reconfirmation and SAML

GitOrigin-RevId: 58daf538d9f0a7db46bb3c1e21f8ca04df095446
2021-03-16 03:04:36 +00:00
ThomasandCopybot 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
ThomasandCopybot 99834f0d7e Merge pull request #3738 from overleaf/jpa-fix-xss-registration
[misc] fix angular xss on user registration page

GitOrigin-RevId: 5dcc2aa0212371f154fba563d21018379292b9fe
2021-03-09 03:04:40 +00:00
ThomasandCopybot 695561aa01 Merge pull request #3733 from overleaf/tm-mathjax-query-param
Add query parameter to MathJax script path

GitOrigin-RevId: c4f17505a23f8de4f5f5c7e62f74db930a029c22
2021-03-09 03:04:37 +00:00
ThomasandCopybot 2d8167fa0a Merge pull request #3675 from overleaf/tm-main-landmarks-a11y
Add main landmark roles to multiple templates

GitOrigin-RevId: 80ae851fae015b21a3210d71d04287c0c9a3024d
2021-03-05 03:05:00 +00:00
ThomasandCopybot 84a4cc33be Replace vendor MathJax with NPM package, upgrade to 2.7.9 (#3702)
* Replace vendor MathJax with NPM package, upgrade to 2.7.9

* Disable fast-preview feature in Mathjax

GitOrigin-RevId: e3ef1dbabae1da7c359e370a2c491a4214841c76
2021-03-05 03:04:57 +00:00
ThomasandGitHub 23738540ed Fix API request errors which could contain API hostname or address (#160)
Wrap errors produced by failing requests to web API, and remove the url/hostname from thrown error messages. (But keep the URL path for info.)
2021-02-24 15:09:19 +01:00
ThomasandCopybot 126c9c02a8 Merge pull request #3654 from overleaf/tm-remove-v1-connection-error-message
Remove V1 connection error warning from projects dashboard

GitOrigin-RevId: 0820adfe385362f2854381bce94db8e953251573
2021-02-17 03:04:10 +00:00
ThomasandCopybot 204117fcd1 Use safe characters in filenames when restoring documents (#3659)
* [admin-panel] Change format of restored snapshot filenames

* [scripts] Change format of restored soft-deleted filenames

GitOrigin-RevId: b928c4237150b38842aa1f2c8f43ffb7eca677b1
2021-02-17 03:04:06 +00:00