Commit graph

21 commits

Author SHA1 Message Date
Brian Gough
558992d947 Merge pull request #13916 from overleaf/bg-managed-users-hide-leave-group-action
managed users hide leave group action

GitOrigin-RevId: 160e31e6935cd3737356714020e057f8c1acc5b8
2023-07-21 08:04:36 +00:00
Brian Gough
f3ac016566 Merge pull request #13907 from overleaf/bg-managed-users-allow-cancelled-subscriptions
allow cancelled subscriptions for managed users

GitOrigin-RevId: 56262ce4bd4cc93d4e5ea92222c76a874d6cad1e
2023-07-20 08:05:08 +00:00
Brian Gough
bc3d6c3636 Merge pull request #13717 from overleaf/bg-managed-users-block-affiliations-fix
fix for block affiliations for managed users

GitOrigin-RevId: cac54288592323ea3f1cd7655d4e2b89ee301002
2023-07-17 10:58:38 +00:00
Brian Gough
a68518dd35 Merge pull request #13694 from overleaf/revert-13584-bg-managed-users-block-delete-own-account
Revert "block account deletion by managed users"

GitOrigin-RevId: ece8024b2fac16066abd36af9a9670ba483b3628
2023-07-17 10:52:53 +00:00
Brian Gough
48947f5e8a Merge pull request #13584 from overleaf/bg-managed-users-block-delete-own-account
block account deletion by managed users

GitOrigin-RevId: 895e5e31951bf60cfade4cf7acc3ef330df214e6
2023-07-17 10:52:44 +00:00
Davinder Singh
4991f9cdc7 Merge pull request #13367 from overleaf/ab-group-invite-halfway-out-of-login
[web] Move the group invite page half-way outside the login wall

GitOrigin-RevId: 8d846df6e248a08433ab2ca991644c78cf9ff330
2023-07-17 10:31:09 +00:00
Eric Mc Sween
75abea72b0 Merge pull request #11492 from overleaf/em-rate-limiter
Move all remaining rate limiters to rate-limiter-flexible

GitOrigin-RevId: 163ab2aebecb281057e552dc75591dd02028990c
2023-01-31 09:03:44 +00:00
M Fahru
21837fefd7 Change URL for interstitial payment page to /user/subscription/choose-your-plan (#8406)
GitOrigin-RevId: ed1832157b2540bf121e64f20d001d665125924e
2022-06-20 08:04:10 +00:00
M Fahru
73cf4116b6 Interstitial Payment Page UI + Route (#8305)
GitOrigin-RevId: a31f7094db819e0dad4ff3f09c17544d40260dd4
2022-06-14 08:02:16 +00:00
Thomas
2d8e832be7 Subscription code decaf cleanup (#7918)
GitOrigin-RevId: 43adff9af7ca347808980823ac641db05129a79b
2022-05-18 08:04:31 +00:00
Alf Eaton
103e31163a Merge pull request #7252 from overleaf/jpa-drop-unused-endpoint
[web] drop unused endpoint for refreshing user features in CI

GitOrigin-RevId: e1be605a398f5fdb2548509cf93ad72c4cc67f84
2022-04-05 12:16:55 +00:00
Timothée Alby
5eed78a3e8 Merge pull request #6099 from overleaf/jpa-recurly-redirect
[web] put hosted recurly pages behind a redirect

GitOrigin-RevId: 51a45dbcc0b74f1f1ae14eda9ed19a733e2d1334
2021-12-15 09:05:27 +00:00
Jakob Ackermann
5e773ce950 Merge pull request #4101 from overleaf/ae-settings-module
Migrate from `settings-sharelatex` to `@overleaf/settings`

GitOrigin-RevId: 9a298ba26382180c1351683c5fddc9004418c1e6
2021-07-08 02:08:28 +00:00
Thomas
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
Jakob Ackermann
95c83866c5 Merge pull request #4112 from overleaf/tm-private-api-basic-auth
Add requireBasicAuth middleware and refactor httpAuth to use it

GitOrigin-RevId: 7f68c0dc4a40102bfe4a97711def517e465ec7fd
2021-06-01 02:05:46 +00:00
Alexandre Bourdin
18d62dcee9 Merge pull request #4071 from overleaf/ab-subscription-decaf-cleanup
Subscription controller decaf cleanup

GitOrigin-RevId: 79b8adfabe30e4557a95b1aad71a5162e6f42cce
2021-05-27 02:06:03 +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
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
Timothée Alby
8cd6e7ccfc Merge pull request #3064 from overleaf/ta-manage-multiple-groups
Allow Users to Manage Multiple Groups

GitOrigin-RevId: c918da0114cdd1d679223f69d81159b4c2608874
2020-08-13 02:06:20 +00:00
Timothée Alby
f5e2983a6b Merge pull request #2609 from overleaf/ta-cmg-recurly-email-update
Add UI to Update Recurly Email

GitOrigin-RevId: 920a741fd9b4312f031bdd40e3d6bec48f1bd579
2020-02-21 04:21:12 +00:00
Alasdair Smith
0ca81de78c Merge pull request #1717 from overleaf/as-decaffeinate-backend
Decaffeinate backend

GitOrigin-RevId: 4ca9f94fc809cab6f47cec8254cacaf1bb3806fa
2019-05-29 09:32:21 +00:00