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
17965 commits 3 branches 7 tags 197 MiB
Commit graph

128 commits

Author SHA1 Message Date
Brian Gough
d2c76b05cf Merge pull request #5425 from overleaf/bg-add-feature-override-script 
add feature override script

GitOrigin-RevId: 90def174b4ac182b6f62984e8f9621f3dc16b92d
 2021-10-14 08:03:18 +00:00
Hugh O'Brien
035b803989 Merge pull request #5154 from overleaf/hb-trial-onboarding-ab 
Trial onboarding email

GitOrigin-RevId: a9e3ba5a5e333c625b4f983012f81f6fde21b8dc
 2021-09-29 08:03:18 +00:00
Jakob Ackermann
59d83c4b88 Merge pull request #5117 from overleaf/jpa-plans-de-ng 
[web] de-ng plans page

GitOrigin-RevId: b902b10b45ab3fd46e71545c94f65e8f079c4564
 2021-09-23 08:03:23 +00:00
Eric Mc Sween
2fdff8288b Merge pull request #5088 from overleaf/em-queue-feature-refreshes 
Perform some user refreshes in the background

GitOrigin-RevId: 3aec73c827bf0f7de7bd9caa369dfc653eac5dd0
 2021-09-21 08:03:13 +00:00
Eric Mc Sween
0f7bfe9173 Merge pull request #5087 from overleaf/em-promisify-subscription-updater 
Promisify FeaturesUpdater and SubscriptionHandler

GitOrigin-RevId: 1a9725afa119c0eaee3d975a11197b6f702f1307
 2021-09-21 08:03:10 +00:00
Timothée Alby
931760629b Merge pull request #5122 from overleaf/ta-trial-extended-event 
Add Subscriptions Trial Extended Event

GitOrigin-RevId: 3fe64f58fbab27e35c417fa2fe9880f883385ad2
 2021-09-17 08:03:16 +00:00
Thomas
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
Hugh O'Brien
f7900b474b Merge pull request #4799 from overleaf/hb-eslint-rules 
Re-enable some eslint rules

GitOrigin-RevId: 16153adb839bb61784bb40fbc8e43da281fe090d
 2021-09-15 08:03:43 +00:00
Alexandre Bourdin
3577f25ba2 Merge pull request #5051 from overleaf/ab-web-mono-analytics-id 
Analytics ID Support (v2)

GitOrigin-RevId: 707f62697f6566d8aad22e424684d97f7bc147df
 2021-09-13 08:03:14 +00:00
Alexandre Bourdin
5b8de28250 Merge pull request #5050 from overleaf/revert-4639-ab-web-mono-analytics-id 
Revert "Analytics ID support"

GitOrigin-RevId: cc5da762ba1bafcbcea65ed0dd86342896b6d1eb
 2021-09-10 08:04:47 +00:00
Alexandre Bourdin
6dd641e0e6 Merge pull request #4639 from overleaf/ab-web-mono-analytics-id 
Analytics ID support

GitOrigin-RevId: 820a6c0f4d19f046f6c791ce4dc64dbc80748924
 2021-09-10 08:04:31 +00:00
Thomas
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
Thomas
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
Alexandre Bourdin
ffb30435d8 Merge pull request #4825 from overleaf/ab-cleanup-sub-page-split-test 
Cleanup subscription page split test and set variant as new copy

GitOrigin-RevId: b7a19cf5f744d9181b71200351dc5a92db939e92
 2021-09-01 08:03:01 +00:00
Jakob Ackermann
4a0af3abef Merge pull request #4874 from overleaf/jpa-web-recurly-unhandled 
[web] emit error object instead of string from RecurlyWrapper.apiRequest

GitOrigin-RevId: 9fd6cac0b763a438063fdeb1f06bdaa4920024d9
 2021-08-26 08:02:50 +00:00
June Kelly
8aeb782791 Merge pull request #4672 from overleaf/sk-validate-currency-param 
Subscription: validate currency in query param
GitOrigin-RevId: 0c9f841ba56b5ce85bbd2adeb3fb2d45d0ad753a
 2021-08-25 08:03:20 +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
Jessica Lawshe
c0b27c4524 Merge pull request #4719 from overleaf/jel-user-features-refresh 
Fix featuresChanged flag

GitOrigin-RevId: 1290f9b2b43cae2f1c4912df649800453ca20344
 2021-08-17 08:03:32 +00:00
Alexandre Bourdin
9468e5cb4f Merge pull request #4338 from overleaf/ab-session-manager 
Extract functions from AuthenticationController to SessionManager

GitOrigin-RevId: 86870ce03a762e1a837dcf493759e8851e759883
 2021-07-28 12:36:22 +00:00
Jakob Ackermann
9dccd6173a Merge pull request #4305 from overleaf/jpa-fix-undef 
[misc] fix undefined references in all the places and enable lint rule

GitOrigin-RevId: 473dbab577b34f60d6a3fe567e29e13cb5b1cb24
 2021-07-14 12:40:42 +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
40c7f2dae1 Merge pull request #4219 from overleaf/ab-group-subscription-user-property 
Send group subscription user property

GitOrigin-RevId: d1033ab4e0b5061b9d4a781e319d6b690f7e6154
 2021-07-06 02:05:54 +00:00
Thomas
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
Alexandre Bourdin
c370785510 Merge pull request #4216 from overleaf/ab-mixpanel-events-cleanup 
Cleanup analytics subscription events

GitOrigin-RevId: b55debe0d76f5e2d84e12de9cced8f69a03b8b95
 2021-06-17 02:09:50 +00:00
Alexandre Bourdin
9f1784b4c4 Merge pull request #4200 from overleaf/ab-feature-set-user-property 
Resolve and send feature set user property to analytics

GitOrigin-RevId: 08ddd0fe9202b02f7d37547dab1d078bf441a8cf
 2021-06-17 02:09:46 +00:00
Alexandre Bourdin
bb760a3ee2 Merge pull request #4186 from overleaf/ab-expired-sub-plan-code-prop 
Keep subscription plan code user property when a subscription expires

GitOrigin-RevId: 195bfa440dc3fb020f4cbefe44f87bc975aade70
 2021-06-12 02:08:44 +00:00
Alexandre Bourdin
ca1e828ea7 Merge pull request #4138 from overleaf/ab-recurly-webhook-analytics 
Send analytics events and user properties from Recurly webhook

GitOrigin-RevId: 3227dd9e42bad61e17d2ca471f6d68adb7212dab
 2021-06-11 02:05:59 +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
a65c5dde01 Merge pull request #4068 from overleaf/ab-split-test-user-properties 
Store assigned split tests as user properties

GitOrigin-RevId: 1cc09d4d8f19badb73e87c46064bdeac131dd307
 2021-05-27 02:06:10 +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
Timothée Alby
03b2d184b5 Merge pull request #4052 from overleaf/ab-subscription-page-split-test-2 
Subscription page split test

GitOrigin-RevId: 022a91d97f20d584e47e1f6b5575e689983df129
 2021-05-20 02:05:00 +00:00
Jessica Lawshe
3af7b2da30 Merge pull request #4049 from overleaf/jel-featuresUpdatedAt 
Set featuresUpdatedAt

GitOrigin-RevId: 87d53e5ff27a8ebce2ba8c7223d498b291d05a23
 2021-05-19 02:06:10 +00:00
Jessica Lawshe
9b29fa7cbc Merge pull request #4035 from overleaf/jel-reconfirmation-dropbox-notification 
Notification for Dropbox unlinked due to reconfirmation lapse

GitOrigin-RevId: 03d2bed922e1d3dd993f9227b8e7675af42eda4b
 2021-05-19 02:06:06 +00:00
Thomas
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
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
Jessica Lawshe
5d7faa7977 Merge pull request #4006 from overleaf/jel-refresh-features-reason 
Pass reason to refreshFeatures

GitOrigin-RevId: 400e3081333239248e3408f93b0517b9bbdbc90c
 2021-05-12 02:09:55 +00:00
Miguel Serrano
46ecb39bdb Merge pull request #3986 from overleaf/tm-decaf-limitations-manager 
Decaf cleanup of LimitationsManager and tests

GitOrigin-RevId: 9bbfc4c3ad002a424863a43c3c19dc66fa5e9854
 2021-05-06 02:09:39 +00:00
Miguel Serrano
6583d6de21 Merge pull request #3971 from overleaf/tm-migrate-recurly-cancellations 
Migrate cancel/reactivatation of recurly subscription to node client

GitOrigin-RevId: 68a8a3eba7b653ec923d020a74a09e49efa8ba21
 2021-05-06 02:09:35 +00:00
Miguel Serrano
f9871103bf Merge pull request #3949 from overleaf/msm-reenable-eslint-const-rule 
Reenable eslint `prefer-const` rule

GitOrigin-RevId: 4f3825be8b8dff381095209085a36eaab76260d5
 2021-05-06 02:09:14 +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
Alf Eaton
1ebc8a79cb Merge pull request #3495 from overleaf/ae-prettier-2 
Upgrade Prettier to v2

GitOrigin-RevId: 85aa3fa1acb6332c4f58c46165a43d1a51471f33
 2021-04-15 02:05:22 +00:00
Jessica Lawshe
66105d6937 Merge pull request #3782 from overleaf/revert-3773-revert-3718-jel-emailHasLicence 
Revert "Revert "Update emailHasLicence for reconfirmation and SAML""

GitOrigin-RevId: 120ee0ca2f59573578e6279477c6e62972b5fb4a
 2021-04-09 02:05:17 +00:00
Jakob Ackermann
83a38a9980 Merge pull request #3764 from overleaf/jpa-drop-alternative-plans-page-logic 
[SubscriptionController] drop unused handling of alternative plans page

GitOrigin-RevId: 1a4ec8276ac0ea87567cfbad9f8d82544267320c
 2021-03-18 03:05:04 +00:00
Thomas
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
Thomas
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
Thomas
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
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
Alexandre Bourdin
b8fc4b58ca Merge pull request #3741 from overleaf/ta-refresh-institution-users 
Refresh Institution Users Script Changes

GitOrigin-RevId: 917287450ba30a9f8b605a2d38933a0f6e1979e6
 2021-03-11 03:05:21 +00:00