github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-10-24 21:12:38 -04:00
Code Issues Projects Releases Packages Wiki Activity
19846 commits 3 branches 7 tags 197 MiB
Commit graph

36 commits

Author SHA1 Message Date
Thomas
aa9b07d323 Merge pull request #11445 from overleaf/revert-11432-revert-11154-tm-lg-subscription-recurly-cache-name 
Re-instate change property name for recurly status cache to recurlyStatus

GitOrigin-RevId: 3b3415d818629676ee44dbc558a6b87469fd1af0
 2023-01-27 09:03:58 +00:00
Thomas
f6ffae02a9 Merge pull request #11432 from overleaf/revert-11154-tm-lg-subscription-recurly-cache-name 
Revert "Change property name for recurly status cache to recurlyStatus"

GitOrigin-RevId: 6870e421516fd705343f3e8651d8637f791063df
 2023-01-25 09:06:03 +00:00
Thomas
0b6c69dc55 Change property name for recurly status cache to recurlyStatus (#11154) 
* Change property name for recurly status cache to recurlyStatus

Co-authored-by: Lucie Germain <lucie.germain@overleaf.com>
GitOrigin-RevId: a1ff69d531519cd15b82ef72974e9702f43409ac
 2023-01-25 09:05:48 +00:00
Eric Mc Sween
e6b0768021 Merge pull request #10008 from overleaf/em-get-best-subscription-custom-accounts 
Don't try to update custom accounts from Recurly

GitOrigin-RevId: d67088e6616773d30c5972d5b583959c3dc0e508
 2022-10-21 08:04:00 +00:00
Eric Mc Sween
8f63e21026 Merge pull request #10005 from overleaf/em-revert-get-best-subscription 
Revert "pass requester data when fetching best subscription"

GitOrigin-RevId: 7d66ef9d1c136cd729b648266117f42dd38e06b6
 2022-10-18 08:03:49 +00:00
Timothée Alby
2e70803492 Merge pull request #9798 from overleaf/ta-em-gs-best-subscription-fix 
Fix Best Subscription Check

GitOrigin-RevId: a7ea5063d4287a421b96222763a59c15652c8d6f
 2022-10-18 08:03:01 +00:00
Alexandre Bourdin
a0fabee3b4 Merge pull request #9245 from overleaf/integration-project-dashboard-react-migration 
[Integration branch] Project Dashboard React Migration

GitOrigin-RevId: 3c3db39109a8137c57995f5f7c0ff8c800f04c4e
 2022-09-14 08:04:03 +00:00
Thomas
bf96ca52c1 Merge pull request #9148 from overleaf/tm-fix-custom-subscription-view 
Remove Recurly property from personalSubscription object

GitOrigin-RevId: b1d86b8379471fcdeef15da9252d2c377ec673d6
 2022-08-09 08:02:47 +00:00
June Kelly
a450a74351 Upgrade async package to 3.2.2 (#8447) 
* Revert "Revert "Bump async to 3.2.2 (#7618)""

This reverts commit 75153a555211d654744c2e61e27fe21085826c22.

* [web] fix usage of async.queue.drain in script

* [clsi] fix usage of async.queue.drain

* [spelling] fix usage of async.queue.drain

* [redis-wrapper] fix usage of async.queue.drain

* [web] Test that LockManager queue is cleared

This protects against a regression found when upgrading the
async package. Here we test that the `queue.drain` callback
is really getting called, and the lock is being removed from
the LOCK_QUEUES map.

* [redis-wrapper] Upgrade async to 3.2.2

GitOrigin-RevId: df921e6d7f1d505bd467f22e58600ba1aff48869
 2022-06-22 08:03:35 +00:00
Thomas
3a1bba07f7 Merge pull request #8436 from overleaf/tm-update-wording-subscription-dashboard 
Update wording on subscription dashboard

GitOrigin-RevId: 4739677fcf46e5de4db3e3fe2411f6ed9898aa2c
 2022-06-21 08:03:08 +00:00
Alexandre Bourdin
57114c4503 [web] Display the current plan in the project list dashboard (#8293) 
* Display the current plan in the project list dashboard

* Add unit tests for SubscriptionViewModelBuilder#getBestSubscription

* Handle free trial for group subscriptions

* Reuse the info-badge icon for the plan labels

* Do not display subscription status when projects are selected

* Custom tooltip for group subscriptions with team name

GitOrigin-RevId: 40982f70cf9fb7c92058e417b73c84af1648c33e
 2022-06-17 08:03:40 +00:00
Jakob Ackermann
8cdb746628 Merge pull request #8434 from overleaf/revert-7618-dependabot-npm_and_yarn-async-3.2.2 
Revert "Bump async to 3.2.2"

GitOrigin-RevId: a5deaea558011fa5a2e1aebe07856e8b0c87c4fc
 2022-06-16 08:03:10 +00:00
dependabot[bot]
d55f4dfafa Bump async to 3.2.2 (#7618) 
[all] Upgrade async package to 3.2.2

- [web] Fix usages of async library
- [project-history] Fix usage of async library
- [third-party-references] Fix usage of async library
- [track-changes] Fix usage of async library

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: June Kelly <june.kelly@overleaf.com>
GitOrigin-RevId: 90cf132f13da53b2bd6690ee3cdf4d6c8563ecd2
 2022-06-16 08:02:49 +00:00
Thomas
11fddee8e4 Merge pull request #8261 from overleaf/tm-show-correct-price-in-change-plans-list 
Show correct prices in change plans list on subscription dashboard

GitOrigin-RevId: 194b516bae92564d33f50e1c0035d21b2ba246a9
 2022-06-06 08:03:49 +00:00
Thomas
35073d49dc Add error message on subscription dashboard if v1 is down (instead of returning a 500 error page) (#7947) 
* Add error message on subscription dashboard if v1 is down

GitOrigin-RevId: 8c8b5ac4d44cfd2c42101efe1d55a5993ca21eea
 2022-05-20 08:04:43 +00:00
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