github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-10-31 21:21:03 -04:00
Code Issues Projects Releases Packages Wiki Activity
19575 commits 3 branches 7 tags 199 MiB
Commit graph

225 commits

Author SHA1 Message Date
ilkin-overleaf
11e789229e Merge pull request #10528 from overleaf/ii-add-modal-before-checkout 
[web] Show student confirmation modal for student plans on checkout page

GitOrigin-RevId: 6009bde36adb2ca24d3438def95db3b47f1ce8b2
 2022-11-22 09:04:19 +00:00
Miguel Serrano
c30f887727 Merge pull request #9936 from overleaf/msm-itm-referrer 
`itm_referrer` for subscription attribution

GitOrigin-RevId: 2787b55e8b7e9e415e66abef8deb669f3adf0f0d
 2022-10-26 08:03:52 +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
Thomas
692528d8b6 Merge pull request #9869 from overleaf/tm-recurly-extend-trial-next-bill-date 
Use next_bill_date instead of deprecated next_renewal_date

GitOrigin-RevId: 025fe5e8a31de94df355e0aa791b26f3298ef374
 2022-10-18 08:02:53 +00:00
M Fahru
39cb74286d Teardown interstitial payment page split test and implement active variant (#9732) 
GitOrigin-RevId: 755fd2f8a1be48ab6520aaab34ca2ea5d070302d
 2022-10-12 08:04:59 +00:00
Thomas Mees
37b598fa5a Teardown premium features discoverability and implement variant 
GitOrigin-RevId: 46dfa1aae117e1862c828bed568085dcd59acd8b
 2022-10-12 08:04:51 +00:00
M Fahru
1549bac91a Fix event segmentations for some of the plans-page-click events on the new plans page (#9781) 
* change event segmentation to plans-page-layout-v2-annual

* update some new plans page event to have new event key

* add location segmentation key for some of the group plans events

GitOrigin-RevId: 99d8258112d9661955a196e57ca05a017afba0f4
 2022-09-30 08:04:43 +00:00
Thomas Mees
a0c87b2ae1 Rename plans-page-layout-v2 to plans-page-layout-v2-annual 
GitOrigin-RevId: deeec6bde44d8d99e241d54b02248fe6299af4df
 2022-09-28 08:08:13 +00:00
June Kelly
8f44f69a80 Merge pull request #9679 from overleaf/jk-fix-the-module-system 
[web] Fix how imports work in the Module system

GitOrigin-RevId: 00cb3bfa19c6af979216b9d5e6104d489c18244b
 2022-09-23 08:04:15 +00:00
Thomas
db9fad7cf8 Merge onboarding experiments integration branch (#9571) 
* Add onboarding survey page

* Add onboarding new analytics events to mixpanel allowlist

* [web] Try Premium prompt

* moved try-premium code to overleaf-integration

* fixed sheet styling

* Add onboarding flow redirect handling to registration handlers (#9462)

* Add redirect logic for onboarding flow after registration

* Update UPGRADE_PROMPT_URL

* Cleanup style of OverleafAuthenticationController

* Refactor finishLogin calls to call wrapped function in OverleafAuthenticationController

* Refactor user properties/onboarding flow redirect into finishLogin wrapper

* Fix async/await calls after refactoring

* Update tests for finishLogin refactoring

* Don't redirect to upgrade prompt if user has premium via commons

Co-authored-by: Miguel Serrano <mserranom@users.noreply.github.com>
GitOrigin-RevId: 7c392aa6949f99fa909f9ca4e4baad4c4d4ff6be
 2022-09-15 08:04:06 +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
d1a2868fab Implement checkout page 'refreshed' split test with Recurly Elements (#8320) 
* Implement checkout page 'refreshed' split test with Recurly Elements

Co-authored-by: Timothée Alby <timothee.alby@gmail.com>
GitOrigin-RevId: 586a94c7969530f4d2246e9105ef48e868e9510e
 2022-09-05 08:03:51 +00:00
Mathias Jakobsen
f5b2cdc3cb Merge pull request #9319 from overleaf/mj-deferred-recurly-email 
[web] Use bull queues for deferred cancellation email

GitOrigin-RevId: a104f9940badcffc15f1f237a1cefd5dd912f4e0
 2022-08-24 08:04:36 +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
M Fahru
66998e2a00 Refactor createSubscription in SubscriptionController to use async/await (#8938) 
GitOrigin-RevId: 47fd56f35ac1d5727c7e53eeecedf200738c4e11
 2022-07-21 08:03:37 +00:00
M Fahru
d0d1791b04 New plans page: Remove the "group admin" part of student table (#8881) 
GitOrigin-RevId: 3319891aa0f4c0bf0343a7a98e5f8e24c00925cd
 2022-07-18 08:04:44 +00:00
M Fahru
e1399cc10d Remove discount banner from the new plans page (#8814) 
GitOrigin-RevId: 091de891bf7eeb357aabcb2253ec9fbfd64fd38b
 2022-07-13 08:05:40 +00:00
M Fahru
3b4968e263 Change number of users in group plan to have a dynamic value in the new plans page (#8592) 
GitOrigin-RevId: 008c0a1120e5b99945f18f0b4eee60bfcb08a331
 2022-07-13 08:05:33 +00:00
M Fahru
f3118771fe Add new limited discount information on personal plan in the new plans page (#8715) 
GitOrigin-RevId: 7f4e91179ba767ff8b88df7787eaf9d4fe6a5f05
 2022-07-13 08:05:06 +00:00
M Fahru
4fc10d971d Change new plans page group highlighted column and text 
GitOrigin-RevId: d45f1b0780e68908f0517aee6f09e95f030440c6
 2022-07-13 08:05:03 +00:00
M Fahru
ebbe14e1a7 Remove university section from the Student Plans in the new plans page 
GitOrigin-RevId: 00917ab8cd5190721036baab9ea8ab5fca9a3665
 2022-07-13 08:04:59 +00:00
Timothée Alby
5bfb1b8781 Merge pull request #8704 from overleaf/ta-multiple-invites-fix 
Fix UX on Duplicate Group Invites

GitOrigin-RevId: e51c406d578b130972024065f9b8bdb2503944a9
 2022-07-08 08:03:30 +00:00
M Fahru
8488068a82 Fix itm_campaign for "buy now" links has wrong value on interstitial payment page (#8632) 
GitOrigin-RevId: 58ca6d4453f3cdfcb4f2dea8ddb3f6bc1b73a4fe
 2022-07-06 08:03:19 +00:00
M Fahru
d00d40464f Implement interstitial payment page analytics (#8512) 
GitOrigin-RevId: 927e85df0a933d3da2378443c38d852e1970b574
 2022-06-29 08:05:01 +00:00
M Fahru
d8fee0d91a Implement premium features discoverability for user subscription page with split test (#8355) 
GitOrigin-RevId: c4bc01361a2d627f0a87f4ddeb8be8ed40f9acab
 2022-06-23 08:02:58 +00:00
Alexandre Bourdin
3d26c4bb6f [web] Add new admin tool for surveys (#8356) 
* Setup survey module and admin page skeleton

* Replace survey staff access permission with admin-only

* Manage survey config with admin tool

* Display configurable survey in project list + add preview in admin

* Fix linting errors and unit tests

* Add acceptance tests for survey module

* Move survey-form to survey components

* Add configuration option for Recurly group subscription users on surveys

* Change survey pre-link text to a lighter gray for accessibility

* Cleanup survey options implementation after review

GitOrigin-RevId: 8f621951efeae458d1ab081fe98b8d0d539cca1a
 2022-06-23 08:02:37 +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
M Fahru
4c37d47daf Change British spelling for "customise" and "personalise" to American spelling (#8475) 
GitOrigin-RevId: fe5754f08ff337148d8e8717a7495ad1e855fdbf
 2022-06-21 08:03:04 +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
c54c048e35 Implement premium features discoverability on successful subscription page with split test (#8336) 
GitOrigin-RevId: 362fa289fa6e009e316dcaceae0587f5fc18162c
 2022-06-20 08:04:06 +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
M Fahru
0204d7947f Refactor successful subcription to use async/await (#8377) 
GitOrigin-RevId: 5748486848c6e0576c974e5595acbcdee3daf7f3
 2022-06-15 08:04:54 +00:00
M Fahru
73cf4116b6 Interstitial Payment Page UI + Route (#8305) 
GitOrigin-RevId: a31f7094db819e0dad4ff3f09c17544d40260dd4
 2022-06-14 08:02:16 +00:00
Thomas
f4ef8a3ea0 Allow setting plans page currency with url param (#8263) 
* Allow setting plans page currency with url param

GitOrigin-RevId: 5ae977d9872cf5f5b1a234d1273c70c2dd0e14e9
 2022-06-06 08:03:52 +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
M Fahru
b12c108522 [web] Extract reusable table mixin on plans page v2 tables (#8262) 
GitOrigin-RevId: 7d8dcff5fd3f0c450de6cca57b428759d44dec7d
 2022-06-06 08:03:45 +00:00
M Fahru
df35a67707 fix typo, change recomendedCurrency to recommendedCurrency (#8245) 
GitOrigin-RevId: 16d40113d73de10082c3cc7fcb9bd54bbaf5a274
 2022-06-02 08:02:40 +00:00
Alf Eaton
16f3dc3abc Merge pull request #7829 from overleaf/ab-refresh-features-script-update 
[web / script] Handle analytics and dropbox unlinking in refresh_features script

GitOrigin-RevId: 9d0524aeab5dcf810e28c3de4f61ab7f3913f872
 2022-05-27 08:03:58 +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
M Fahru
487ff4f505 Improvement on form data sync between group plan modal and new plan page (#8003) 
GitOrigin-RevId: 66a0a423fe48a8a8a7ddd292ba218cd5038dfdb1
 2022-05-20 08:03:44 +00:00
M Fahru
1b2cefa63e Add new analytics events in the new plans page and update analytics event in the current plans page (#7639) 
GitOrigin-RevId: 71a4e7b0b041bbe7ea6df11cad28857978c77e4e
 2022-05-20 08:03:21 +00:00
M Fahru
dceb6910c9 New plans page: Show initial price value upon first render for group price data (#7974) 
* New plans page: Show initial price value upon first render

* fix wrong test on SubscriptionController and add new tests on SubscriptionHelper

GitOrigin-RevId: a339a97cff2df0728ba35885af8953c8a0e0b7c8
 2022-05-20 08:03:16 +00:00
Thomas
2d8e832be7 Subscription code decaf cleanup (#7918) 
GitOrigin-RevId: 43adff9af7ca347808980823ac641db05129a79b
 2022-05-18 08:04:31 +00:00
M Fahru
5387ec8467 Change "1 users" to "1 user" on new plans page table features (#7934) 
GitOrigin-RevId: 2e4faea0907b8bfb31c294f8aa74bfee8d0b53f5
 2022-05-18 08:03:34 +00:00
Jakob Ackermann
f0bd6dda23 Merge pull request #7986 from overleaf/jpa-eslint-8 
[misc] upgrade eslint packages to the latest version everywhere

GitOrigin-RevId: f1480d4a171acef82fb26c4aa54be3a6088b0ab3
 2022-05-17 08:05:59 +00:00