Tim Alby
3dbd913d97
disambiguate between displayPrice and recurlyPrice
...
GitOrigin-RevId: 38f4c51b9834c417824c0093096767f50e998cb8
2022-01-21 09:03:16 +00:00
Alf Eaton
50df230846
[web] Upgrade Prettier to match version in monorepo root ( #6231 )
...
GitOrigin-RevId: 02f97af1b9704782eee77a0b7dfc477ada23e34d
2022-01-11 09:03:23 +00:00
Jakob Ackermann
7954326711
Merge pull request #6136 from overleaf/jpa-fix-promise-vs-cb
...
[web] use promise based interface for getting the recurly subscription
GitOrigin-RevId: cb9409a824aa3df0f3a2def39237020227612eab
2021-12-15 09:05:52 +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
Jessica Lawshe
379d9ac41c
Merge pull request #4659 from overleaf/jel-em-duplicate-subscription-message
...
One Pro message per current commons institutions
GitOrigin-RevId: 21b74af8b9da1b6647a0384115f5d268b80e4bdf
2021-08-17 08:03:44 +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
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
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
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
Eric Mc Sween
e5c49ea19a
Merge pull request #3681 from overleaf/em-group-plans
...
Configure group plans for additional licenses
GitOrigin-RevId: 57822de9f490505c4b083afa80220e4d5b4c7d23
2021-02-23 03:04:43 +00:00
Timothée Alby
450d744f9a
Merge pull request #3665 from overleaf/cmg-jpa-members-limit-addon
...
Support membersLimit add on for recurly subscriptions
GitOrigin-RevId: d4256665d703e3c348cdac11af669c70f3c2feb2
2021-02-19 03:04:33 +00:00
Alf Eaton
2ff1cf43d6
Merge pull request #3470 from overleaf/eslint
...
Upgrade and configure ESLint
GitOrigin-RevId: ad5aeaf85e72c847a125ff3a9db99a12855e38aa
2020-12-16 03:08:28 +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
Timothée Alby
98f031e9aa
Merge pull request #2619 from overleaf/ta-licence-attribute-fix
...
Read Licence Attribute from Affiliation Instead of Institution
GitOrigin-RevId: 2294222e2bd0da473a303d3ffdc5ddb7d856f7f7
2020-02-21 04:20:59 +00:00
Jessica Lawshe
f2636e0555
Merge pull request #2572 from overleaf/ta-personal-plan-test
...
Personal Plan Filter Test
GitOrigin-RevId: e0e75bdd43b27cda787d039f9cfaad64e96afa67
2020-02-06 04:20:09 +00:00
Simon Detheridge
34d3671640
Merge pull request #2533 from overleaf/revert-2460-hb-remove-personal-plan-code
...
Add back specific logic for old default personal plan code
GitOrigin-RevId: 36aa2ab2be06c27faa6ffca7f2dacdf8aef9322f
2020-01-28 04:18:53 +00:00
Eric Mc Sween
a7db312404
Merge pull request #2460 from overleaf/hb-remove-personal-plan-code
...
remove specific logic for old default personal plan code
GitOrigin-RevId: fd4ef1949f337f6c09ea963473e3aeb8eff5c62f
2020-01-07 04:21:31 +00:00
Eric Mc Sween
358cd22f54
Merge pull request #2087 from overleaf/subscription-invoices-link
...
Add Link to Invoices for Recurly Subscriptions
GitOrigin-RevId: dd3aa999c26988f2bd42b0db83dbfb0ce586a0a7
2019-08-20 12:59:58 +00:00
Timothée Alby
109585d20c
Merge pull request #1947 from overleaf/ta-cleanup-guard-1
...
Remove __guard__ Function Used to Access Settings
GitOrigin-RevId: 15e3749990a9fc68f8d344390b1bf0d09d839106
2019-07-15 13:23:38 +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
