github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-01 15:31:30 -05:00
Code Issues Projects Releases Packages Wiki Activity
23856 commits 3 branches 7 tags 206 MiB
Commit graph

591 commits

Author SHA1 Message Date
Rebeka
0c695fbbcb Revert "Suppress the cookie banner when the footer is suppressed, except for the new login and registration page variant" 
This reverts commit 3bd0e3aa9cbebbfc41db54ed4307540d1c557363.

GitOrigin-RevId: 4b5f7662105add926c122b9f8205528400c1023d
 2023-07-17 11:13:18 +00:00
Rebeka
ece6586dc3 Suppress the cookie banner when the footer is suppressed, except for the new login and registration page variant 
GitOrigin-RevId: 3bd0e3aa9cbebbfc41db54ed4307540d1c557363
 2023-07-17 11:13:08 +00:00
June Kelly
4f8852feaa Merge pull request #13850 from overleaf/ab-invite-enrollment 
[web] Managed users - combined invite/surrender flow

GitOrigin-RevId: 70cb0d81e0019eac69a4a565377447bb6d1a1823
 2023-07-17 11:10:37 +00:00
Thomas
e704afdcca Merge pull request #13804 from overleaf/tm-geopricing-inr-banners 
Implement split test for new INR geo-pricing banners/modal

GitOrigin-RevId: 06fbcf70b7ee90b9b365ac96c1fa0373cbe60847
 2023-07-17 11:09:44 +00:00
Rebeka
fdeb36c2c2 Tear down student status check test 
GitOrigin-RevId: 5afff525e6748621790fcdc986541363fe19e1e8
 2023-07-17 11:01:37 +00:00
M Fahru
afbd143f0f Remove unused code and translation locales from old subscription pages (#13646) 
* Remove unused code from old subscription pages.

* Remove unused translation locales from old subscription pages.

GitOrigin-RevId: abf99373188bafa90f4900a358a30b4cc8a433d1
 2023-07-17 10:48:45 +00:00
Alexandre Bourdin
39bc601826 Merge pull request #13482 from overleaf/ab-group-settings-page 
[web] Group settings button and page enabled based on env var

GitOrigin-RevId: 77574a3705b3f1301935b72010022af61f7fe552
 2023-07-17 10:41:41 +00:00
M Fahru
542199febb Merge pull request #13419 from overleaf/mf-sync-border-radius-and-border-color-plans-table 
Fix various plans page border-related UI errors

GitOrigin-RevId: 90436bdd3002722e5ce6b08d79d2bf3db1b6c90f
 2023-07-17 10:36:56 +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
Alexandre Bourdin
14e014c667 [web] Add some FR translations for the menu header, project dash and plans page (#13057) 
* Add some FR translations for the menu header and plans page

* Replace single quotes in translations

* Fix typo and missing translation

* Updates after rebase

GitOrigin-RevId: 637f60513afad1a44a38fabcc6afa261c658d322
 2023-07-17 10:23:05 +00:00
Alexandre Bourdin
150cf21710 Merge pull request #13311 from overleaf/ab-tear-down-subscription-pages-react 
[web] Tear down subscription-pages-react test and remove Angular code

GitOrigin-RevId: 3cf906e476ffa52a058ccb4e4acbb89a657bd021
 2023-07-17 10:22:45 +00:00
Jimmy Domagala-Tang
b6f0b32df5 Merge pull request #13234 from overleaf/jdt-subscriptions-cols-fix 
fix col spacing on subscription page

GitOrigin-RevId: 886274f7b566632ac4f4ca3388d43b1b03575f6f
 2023-05-26 08:05:19 +00:00
Jimmy Domagala-Tang
76d0d82e74 Merge pull request #13027 from overleaf/jdt-personal-plan-split-test 
Personal plan split test

GitOrigin-RevId: 067973398c57be7466f6529f28fbfd896c86b10b
 2023-05-25 08:05:52 +00:00
June Kelly
f5740e6b17 Merge pull request #12593 from overleaf/jk-remove-plans-split-test 
[web] Remove 'plans-page-layout-v3' split test

GitOrigin-RevId: 91e0d3d8bc40632df630131b2e872fa824015da5
 2023-04-26 08:04:21 +00:00
Jakob Ackermann
6da00de5ea Merge pull request #12187 from overleaf/jpa-mf-old-plans-page-annual-variant 
Differentiate user that visits from before the fix and after the fix

GitOrigin-RevId: 4c3c4b47dc3329b97da79adcb2a45bf95b0ff27a
 2023-03-13 09:04:32 +00:00
Jakob Ackermann
7ae5a9f060 Merge pull request #12160 from overleaf/mf-old-plans-page-annual-button 
Fix annual buy button in old plans page is linked to the free trial check out page

GitOrigin-RevId: 7157b354a21e46f4eb194ae1ef741e90790b6071
 2023-03-13 09:04:23 +00:00
Thomas
5dc15a19de Merge pull request #12083 from overleaf/tm-teardown-refreshed-payment-page 
Tear down refreshed payment page test, keeping refreshed page

GitOrigin-RevId: 4f0d9a1f4bcd3b018b12372fbe86aad3c8e41fbd
 2023-03-10 09:04:18 +00:00
ilkin-overleaf
48587a7a62 Merge pull request #12007 from overleaf/ii-react-subscription-dash-thank-you 
[web] Successful subscription react migration

GitOrigin-RevId: 1d7d849415f4b7a7f60ddf8a4e18570ff5142196
 2023-03-02 09:04:04 +00:00
Jessica Lawshe
0037e45740 Merge pull request #11970 from overleaf/ab-sub-dash-already-have-warning 
[web] Display a warning on subscription dash when coming from plans page

GitOrigin-RevId: 6c6294fbf634a5dcd1a09b94538add6586ebd15b
 2023-02-24 09:05:20 +00:00
Jessica Lawshe
ebc04e4a9d Merge pull request #11888 from overleaf/jel-subscription-dash-cancel-plan 
[web] Migrate cancel subscription to React

GitOrigin-RevId: 8482fd61894c8011b4c980263ae1d41f396233c6
 2023-02-24 09:05:12 +00:00
Alexandre Bourdin
d2fb800174 Merge pull request #11885 from overleaf/ab-personal-sub-custom-react 
[web] Display a message for custom personal subscriptions in React dash

GitOrigin-RevId: c70986ffacfdfdeccd3675385e2e5dba1a2ad61f
 2023-02-23 09:05:13 +00:00
Alexandre Bourdin
8b00a496e7 Merge pull request #11881 from overleaf/ab-custom-subscription-react-dash 
[web] Add a contact support message for custom subsbcriptions on React dash

GitOrigin-RevId: e2a2bb27b4f1e70cbbe62f4c837fe63d81a820c2
 2023-02-23 09:05:05 +00:00
Alexandre Bourdin
f86eeac522 Merge pull request #11862 from overleaf/ab-group-subscription-memberships-dash-react 
[web] Migrate group subscription memberships to React dash

GitOrigin-RevId: d5ff3ae4e5d8c422530502af22edda6c24c9a593
 2023-02-23 09:04:49 +00:00
Alexandre Bourdin
d6e9508aed [web] Migrate managed publishers to React dash (#11749) 
* Migrate managed publishers to React dash

* Decaf cleanup + async/await PublishersGetter

* Continue migration of managed publishers to react dash

* Fix linting

* Add tests

* Decaf cleanup PublishersGetterTests

* Update PublishersGetter tests

* Rename component files to kebab-case

GitOrigin-RevId: cb1fe14d120457c965a9d23a8ddb2c2c92e1d5da
 2023-02-23 09:04:03 +00:00
Jessica Lawshe
b2a10260be Merge pull request #11773 from overleaf/jel-subscription-dash-change-to-group 
[web] Begin change to group plan via React subscription dash

GitOrigin-RevId: 3f0f2820ab18ecc8337746282295302d7951c56f
 2023-02-22 09:04:56 +00:00
Thomas
f7e632ceb9 Merge pull request #11808 from overleaf/mf-appName-resolution-bug-string 
Fix `appName` does not properly transformed on some strings

GitOrigin-RevId: be2f8a4a33fc30b1d8465f88522d69c3004bf00c
 2023-02-14 09:04:33 +00:00
ilkin-overleaf
b0841592c7 Merge pull request #11646 from overleaf/ii-payment-page-payment-preview-panel 
[web] Payment page payment preview panel

GitOrigin-RevId: 35f2e11a9a80e8b240dc8485b8062cf33d5b40b4
 2023-02-09 14:34:18 +00:00
ilkin-overleaf
f6ddb95ae5 Merge pull request #11573 from overleaf/ii-payment-page-migration-three-d-secure 
[web] Payment page migration 3DS

GitOrigin-RevId: b1049882c0f9fd17af2d2974e3f59b01af353c8f
 2023-02-09 09:04:13 +00:00
Thomas
ce79f03b87 Merge pull request #11706 from overleaf/jpa-fix-de-translations 
[web] fix a few German translations

GitOrigin-RevId: a19713144a236e367a28bd443919bd81acbb4656
 2023-02-09 09:03:57 +00:00
Jessica Lawshe
c36b872ae3 Merge pull request #11509 from overleaf/jel-react-personal-subscription-dash-pt-4 
[web] Continue migration of personal subscription dash to React

GitOrigin-RevId: f2d913099d727725f04697003516c90616faf014
 2023-02-08 09:06:21 +00:00
ilkin-overleaf
db54475bd0 Merge pull request #11525 from overleaf/ii-payment-page-migration-init 
[web] Payment page migration initialisation

GitOrigin-RevId: f33b73a13b96fad3cddf0c0205d05df678ce5300
 2023-02-02 18:21:52 +00:00
M Fahru
e5f8b991ba Add text to clarify what currency is being displayed in the new plans page (#11568) 
GitOrigin-RevId: 7875f0afa4e6a538bd52d800ae75de231bf40629
 2023-02-02 09:03:25 +00:00
Jessica Lawshe
b7108f7874 Merge pull request #11515 from overleaf/ab-group-membership-dash-react 
[web] Managed groups in React subscription dash

GitOrigin-RevId: 4811d8dd2b42fa9ad83b5c4f12582e7bc04bad40
 2023-02-01 09:05:27 +00:00
M Fahru
781c1c97c7 Implement new three-way split test for the plans page (#11493) 
* Update split test config and infrastructure for plans-page-layout-v3

* Implement view for `old-plans-page-annual` variant of the new split test:
    - Make `annual` the default view for all elements on the old plans page
    - Change the tooltip background to green for monthly/student view

* Implement a new design for the new plans page:
    - switch annual and monthly locations (annual on the left now)
    - change the tooltip background to green color for all choice
    - make the monthly-annual switch has green background if annual is chosen

* Fix mobile view plans page header style

GitOrigin-RevId: b2b3c6ac6adbe26bf6def7e072493f503793cfcb
 2023-01-30 09:02:45 +00:00
Jessica Lawshe
dad1460d71 Merge pull request #11414 from overleaf/jel-react-personal-subscription-dash-pt-2 
[web] Continue migration of personal subscription dash commons to React

GitOrigin-RevId: 997716f70c953b088f686d4b0f638705ad838520
 2023-01-27 09:05:30 +00:00
Eric Mc Sween
30e94eba32 Merge pull request #11444 from overleaf/em-price-increase-subscription-page 
Fix copy when a pending subscription change is a price change

GitOrigin-RevId: 2ab3470f5eda5460bdf08f8464e42d6a7717d814
 2023-01-26 09:04:30 +00:00
Jessica Lawshe
c8ef5e6f65 Merge pull request #11231 from overleaf/jel-react-subscriptions-dash-commons 
[web] Migrate institution memberships dash to React

GitOrigin-RevId: 75bb8e7d7338418733a836a8e654fe5b0a9fceff
 2023-01-18 15:09:28 +00:00
Jessica Lawshe
6a127d4408 Merge pull request #11159 from overleaf/jel-use-btn-secondary-on-group-invite 
[web] Use new secondary button style on group invite

GitOrigin-RevId: 3772d2a2fd4143592494eae383be957f3ce99cac
 2023-01-18 15:09:13 +00:00
ilkin-overleaf
7e68b4f0d5 Merge pull request #11147 from overleaf/ii-subscriptions-pages-react-split-test 
[web] React subscription split test

GitOrigin-RevId: 6656b3895030bc677483a3e30d5e998f5f7d1458
 2023-01-13 09:04:52 +00:00
Jessica Lawshe
e391a9fc46 Merge pull request #11079 from overleaf/jel-features-link-analytics 
[web] Add analytics to features link

GitOrigin-RevId: 80cbba05dfc94bce0b2f0b25a41ac76c8d22eee6
 2023-01-12 09:03:38 +00:00
ilkin-overleaf
8ca4827834 Merge pull request #11071 from overleaf/jpa-typo-symbol-palette 
[web] fix typo in symbol palette feature on new subscription pages

GitOrigin-RevId: b167c861ac77b8aaf5e78eae8a5d4c121e0c5f7d
 2023-01-10 09:06:06 +00:00
Mathias Jakobsen
38cc3394e3 Merge pull request #10793 from overleaf/mj-split-test-cleanup 
Split test clean-up

GitOrigin-RevId: 7dd6178487022cbefcbc85797dacc3f3fbfa17e2
 2022-12-21 09:04:04 +00:00
Jessica Lawshe
d7233870b9 Merge pull request #10891 from overleaf/jel-features-page-test 
[web] Setup split test for new features page

GitOrigin-RevId: c301089f2a251fef6cdc4434ac3c8356bb17545d
 2022-12-20 09:04:44 +00:00
Davinder Singh
e7e1fcef3b Merge pull request #10796 from overleaf/ds-plans-page-btn-tag 
Replaced the a tag with button tag for plans page plans options

GitOrigin-RevId: 4717067ce0fc9209a65c0d323602d834a90951fc
 2022-12-19 09:04:10 +00:00
Davinder Singh
ec920ade78 Merge pull request #10563 from overleaf/ds-btn-success-to-btn-primary 
replacing `btn-success` with `btn-primary`

GitOrigin-RevId: 77b90dbc4470bc059c40294b9764d1184f0b0bb8
 2022-12-08 09:03:28 +00:00
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
Jessica Lawshe
024f6ee24e Merge pull request #10467 from overleaf/ds-btn-info-new-css-part-2 
Updating`btn-info` to `btn-info-secondary` - part 2

GitOrigin-RevId: 934dd633494454277432810c4a1e70bb17829bd7
 2022-11-18 09:05:51 +00:00
Miguel Serrano
75fcdafb15 Merge pull request #10418 from overleaf/msm-fix-itm-campaign 
Fix `itm_campaign=undefined` in insterstitial plans page

GitOrigin-RevId: 4826b507a93d3c324d600a938234ba31b4582955
 2022-11-17 09:03:56 +00:00
ilkin-overleaf
87b844aa15 Merge pull request #10438 from overleaf/ii-offer-personal-plan-on-cancellation 
[web] Offer personal plan on subscription cancellation

GitOrigin-RevId: a7845fb3f7edc2f169ba237d8b822ff958a5c6a5
 2022-11-16 09:06:18 +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
Thomas
f6a6e767e6 Merge pull request #9947 from overleaf/tm-teardown-bts2022-promo 
Teardown Back to School 2022 promo banners

GitOrigin-RevId: b26229af17c7ce272632106850fce504cdca04d2
 2022-10-18 08:02:50 +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
Jessica Lawshe
c832d5cea8 Merge pull request #9861 from overleaf/tm-bts2022-banner-message-end-date 
Update banner message with end date for BTS2022 promo

GitOrigin-RevId: 410120c0fc7a8dd976fa0434d120587f2525cc11
 2022-10-07 08:04:56 +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
Thomas
135ec8db8f Merge pull request #9705 from overleaf/tm-bts2022-banner-message 
Update banner message on back to school 2022 promo

GitOrigin-RevId: e8f2173d466c485b6186485aba49aeb27c094d8e
 2022-09-23 08:04:53 +00:00
Thomas
e84c1740bc Merge pull request #9652 from overleaf/tm-plans-v2-default-monthly 
Default to showing Annual plans when rendering the V2 plans variant

GitOrigin-RevId: a709e81de3672959c67f6afd0234fb9277400d9d
 2022-09-21 08:04:53 +00:00
Thomas
281f222d82 Merge pull request #9612 from overleaf/tm-onboarding-upgrade-prompt-analytics-fix 
Fix event tracking for onboarding upgrade prompt page

GitOrigin-RevId: 8122cc7f290cc0ba07c8d38c71d8b762bb760f32
 2022-09-15 08:04:27 +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
Thomas
0919f081a7 Merge pull request #9540 from overleaf/tm-back-to-school-2022-banners 
Add back to school 2022 banners to project dash and plans

GitOrigin-RevId: 40893bad0b6a90bb25f671949b7b8837ead54053
 2022-09-13 08:05:31 +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
M Fahru
37c69fc6b7 Fix interstitial payment monthly annual switch doesn't show the correct table 
GitOrigin-RevId: ad88867922aafd65f245ff04d13203acbcf21b94
 2022-07-28 08:03:43 +00:00
Thomas
7705acfa1f Merge pull request #8874 from overleaf/tm-revert-personal-price-experiment 
Revert personal plan discount experiment to original pricing

GitOrigin-RevId: 3134a187e4900570580c3717fe0e19077399eb4d
 2022-07-18 08:05:15 +00:00
M Fahru
b07afa563f Change URL in new plans page contact us buttons 
GitOrigin-RevId: 251894d41080a759ac24cdc3cebe67c664dce9f4
 2022-07-15 08:03:53 +00:00
M Fahru
4dbabe3a8d Only show university info box on new plans page student tab (#8823) 
GitOrigin-RevId: 057baae295443d9a924b4b0754cdb12ebe330976
 2022-07-13 08:05:54 +00:00
M Fahru
cc92f264d2 Improve new plans page university info styling and change its copy (#8822) 
GitOrigin-RevId: ebb0e3677cce862f22757a5a7236591d98f39078
 2022-07-13 08:05:47 +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
8603fcac6c Add correct link to the university support button (#8797) 
GitOrigin-RevId: 1ecb591ff9dd99d195eed0fa2ae4b5702ef53b7e
 2022-07-13 08:05:27 +00:00
M Fahru
6c7fd1dad0 Add new university info card in the new plans page (#8676) 
GitOrigin-RevId: 7d9ec211930afc2536df36665d6cfc6f2cd7b46b
 2022-07-13 08:05:13 +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
ebbe14e1a7 Remove university section from the Student Plans in the new plans page 
GitOrigin-RevId: 00917ab8cd5190721036baab9ea8ab5fca9a3665
 2022-07-13 08:04:59 +00:00
Thomas Mees
0cb51a3d52 Remove unused allCardsAndControls from v2 plans page 
GitOrigin-RevId: 9b31299ba504bd3f39ca6a3030e32f8bc1e29aa1
 2022-07-13 08:04:52 +00:00
Timothée Alby
e48c23546e Merge pull request #8724 from overleaf/ta-subscription-contact-link 
Link to Contact Page in Subscription Translations

GitOrigin-RevId: f255b0408cf4cf1e6e19cf8d3eebbe996327a598
 2022-07-08 08:03:18 +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
bbaac83b82 Refactor plans v2 sticky header to use dedicated config instead of hardcode (#8659) 
GitOrigin-RevId: 3ea56ad5c6b9b5f6556e97429cf3e67a0b0d56bc
 2022-07-06 08:03:02 +00:00
M Fahru
d00d40464f Implement interstitial payment page analytics (#8512) 
GitOrigin-RevId: 927e85df0a933d3da2378443c38d852e1970b574
 2022-06-29 08:05:01 +00:00
M Fahru
df93eaef1c Change copy for premium features discoverability on thank you for subscribing page (#8531) 
GitOrigin-RevId: faab715bc86bced4b33deb7493b8fe7743359573
 2022-06-23 08:03: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
M Fahru
361f6f245a Refactor new plans page (#8493) 
* [web] hide the monthly/annual switch for small screens via css

Co-Authored-By: Jakob Ackermann <jakob.ackermann@overleaf.com>

* [web] merge logic for hiding elements shown in a subset of view

Co-Authored-By: M Fahru <m.fahru@overleaf.com>

* [web] hide the monthly/annual switch for small screens via css

Co-Authored-By: M Fahru <m.fahru@overleaf.com>

* [web] merge logic for hiding elements shown in a subset of view

Co-Authored-By: M Fahru <m.fahru@overleaf.com>

* fix inverted logic on monthly annual checking

* delete some duplicated logic and refactor

* merge switch functions

* move global variable into the main module

* simplify the enable and disable switch

* remove unused parseFloat

* simplify group plan pricing calculation

* simplify discount group plan logic

* simplify sticky header logic

* merge view and period switching

* fix underlining of switch text

* simplify class list toggling

* merging two function of the group plan

Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>
GitOrigin-RevId: 5e51690514bbf1dee2639011748c6a8470e1c19a
 2022-06-23 08:02:56 +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
66c27ae153 Fix interstitial page student plans have wrong button background color (#8489) 
GitOrigin-RevId: f9f3ec239c06c9ecc7e608aaf879d69041c0a9a3
 2022-06-21 08:02:58 +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
M Fahru
1070dd53f3 Remove footer and rightside of the navbar on the interstitial payment page (#8407) 
Co-authored with Thomas Mees (thomas.mees@overleaf.com)

GitOrigin-RevId: 270e11f0cfd09830e5c7600d636b8ebbfc6049a2
 2022-06-15 08:05:00 +00:00
M Fahru
73cf4116b6 Interstitial Payment Page UI + Route (#8305) 
GitOrigin-RevId: a31f7094db819e0dad4ff3f09c17544d40260dd4
 2022-06-14 08:02:16 +00:00
M Fahru
61e57e8a6a [web] fix new plans page table header additional link URL (#8302) 
GitOrigin-RevId: a377e8012884297e4c555bad465112d575621133
 2022-06-10 08:03:37 +00:00
M Fahru
199360afb8 Extract monthly annual switch on new plans page as mixin (#8292) 
GitOrigin-RevId: 4634557dff55a747206d3fb355b9924ca769e98c
 2022-06-06 08:04:07 +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
M Fahru
b4bb9f2b0f Change divider label in new plans page table to bold using <b> tag (#8120) 
GitOrigin-RevId: 8cc1551822f4288302ea01b9a20ab208152b0644
 2022-05-26 08:04:44 +00:00
Thomas
6564147b0a Merge pull request #8142 from overleaf/tm-fix-recurly-double-submission 
Fix plan change buttons not being disabled while request inflight

GitOrigin-RevId: a87c89ce6c9642a7988e2dfcc7ee6e3673c6128d
 2022-05-26 08:04:12 +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
Alf Eaton
a59a1bec4d Merge pull request #8012 from overleaf/jel-subscription-dash 
[web] Add missing group contact modal for subscription dash

GitOrigin-RevId: 45f0a19fefccd4ebc5838494d00650557cc5b8fe
 2022-05-20 08:04:26 +00:00
M Fahru
68df9e9325 new plans page: Update wrong text on various places + reuse translation key (#7950) 
* change wrong description on individual standard (collaborator) plan on the new plans page

* reuse old "one_collaborator" translation key and fix individual professional description

* fix wrong descriptions on student table

* new plans page: remove buy button exclamation mark

* change "Buy Now" to "buy now"

GitOrigin-RevId: 274bca246b5f3d877b795e67036b93ab3494a1c3
 2022-05-20 08:03:27 +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
M Fahru
22b1797c18 change button text on non-trial monthly plan on payment page (#7973) 
GitOrigin-RevId: 83378ea13d16d3add31ed6a93f1a13fdc3860431
 2022-05-18 08:04:12 +00:00
M Fahru
4d25132a5f new plans page: refactor custom tooltip to bootstrap tooltip (#7972) 
GitOrigin-RevId: d3552867a9e9176288803cadffacb5f3dab24895
 2022-05-18 08:04:06 +00:00
M Fahru
5050493827 Add close button to group plan modal (#7959) 
* add close button to group plan modal

* change hardcoded string to translation key

GitOrigin-RevId: fa259745cad1a6214d06a1379fc5c3ffb8377557
 2022-05-18 08:04:00 +00:00
M Fahru
e2fe475116 change copy on group plans and remove the bold font on checkbox label (#7943) 
GitOrigin-RevId: 31acc96cf3f6d85d44388497d6bba52bb5ae9667
 2022-05-18 08:03:53 +00:00
M Fahru
5fdcd74a0e update FAQ on new plans page (#7937) 
GitOrigin-RevId: 632b507217fb13c1de7c364a11244e49d85cac58
 2022-05-18 08:03:41 +00:00
M Fahru
8157616f85 [web] New Plans Page for A/B Test (#7330) 
GitOrigin-RevId: 4e4629583c6e86bd2bc6165d123224734c133df7
 2022-05-13 08:03:30 +00:00
M Fahru
cf0b46ecf2 Add annual saving tooltip & add a striked-through text on the annual price to current plans page 
Co-authored-by: Thomas Mees <thomas.mees@overleaf.com>
GitOrigin-RevId: 25a9b7b12ddd00588a8e4c43b55f2d7c57048818
 2022-05-12 10:41:11 +00:00
Tim Down
f4b5d1ca81 Merge pull request #7888 from overleaf/td-em-let-us-know-link 
Fix "Let us know" link to open modal dialog

GitOrigin-RevId: a95433d0cfc93e3720da7b6cbc43798e1348e8a8
 2022-05-12 08:04:55 +00:00
Thomas
35e0d83343 Refactor undiscounted price display to fix comparison tables (#7807) 
* Refactor undiscounted price display to fix comparison tables

GitOrigin-RevId: 4345757c80f5a647596270d60f9e0a1546584640
 2022-04-29 08:03:29 +00:00
Thomas
8352bada7b Add copy for personal plan discount, and include old undiscounted price on plans page (#7770) 
* Add copy for personal plan discount, and include old undiscounted price on plans page

GitOrigin-RevId: 34d1361d8257e0ed1923bc6f8950167657e44055
 2022-04-28 08:04:15 +00:00
M Fahru
bce02b25e4 Merge pull request #7358 from overleaf/mf-fix-tooltip-plans-page 
[web] Fix tooltip on plans table for plans & pricing page

GitOrigin-RevId: a1e284956e2dc359eec31c6348e5ebffe46697be
 2022-04-08 08:04:39 +00:00
M Fahru
f23accc572 Merge pull request #7292 from overleaf/tm-plans-page-layout-teardown 
Tear down plans page split test variant with new layout

GitOrigin-RevId: ab09066f05d17ca17a19ab8895fac141e1e89bff
 2022-04-08 08:04:32 +00:00
M Fahru
4221825a18 Merge pull request #7240 from overleaf/mf-subscribe-survey-link 
[web] Add a new survey link after user successfully subscribed

GitOrigin-RevId: d9b260e3727dbbdfd93ccc118be10be7aed246f2
 2022-04-05 12:17:11 +00:00
Thomas
cc6a9519e2 Merge pull request #7074 from overleaf/tm-collaborator-to-standard-split-test 
Add split test for 'Collaborator' to 'Standard' name change

GitOrigin-RevId: 549c5ac566f622f52218adc571a427e6241a53ee
 2022-03-18 09:03:17 +00:00
Davinder Singh
726a47421e Merge pull request #6754 from overleaf/ds-subscription-address-length 
Updated maxlength of subscription address field

GitOrigin-RevId: b08717a4e0e052e1c2fa92308767dfea56d8ea4d
 2022-02-23 09:04:44 +00:00
Timothée Alby
0a27b3711f Merge pull request #6599 from overleaf/ta-new-subscription-split-test 
Payment Page Split Test

GitOrigin-RevId: bb43cbf4e5722bd18076f2f8bf1014816bce1df0
 2022-02-16 11:34:44 +00:00
Timothée Alby
62b662f07a Merge pull request #6561 from overleaf/tm-subscription-cancel-button-split-test 
Update copy for subscription cancellation, in split test variant

GitOrigin-RevId: ab5847238b950099bf41b9d4c08f325ffce1051d
 2022-02-16 11:34:08 +00:00
Thomas
bbb97bed26 Merge pull request #6558 from overleaf/tm-wfh2021-ended 
Remove notifications for WFH2021 offer, revert side-bar to old Upgrade notice

GitOrigin-RevId: d5f0bb34b40605a335d48b1d2db54df8fab9224a
 2022-02-02 09:03:14 +00:00
Thomas
635a478f36 Add plans page split test variant with new layout (#6450) 
* Add plans page split test variant with new layout

* Set itm_content to toggle if group modal clicked through via variant view toggle button

* Change split test name to be more specific

GitOrigin-RevId: 0fa48b1b74eea84f15e630e3a62b36be5549da9e
 2022-02-02 09:03:11 +00:00
Thomas
1777c075ea Merge pull request #6423 from overleaf/tm-plans-new-events 
Add new analytics events to plans page/subscription flow

GitOrigin-RevId: 7b70ee30749ebc671cf2445f3cbdae91a7278b01
 2022-02-02 09:03:07 +00:00
Tim Alby
3dbd913d97 disambiguate between displayPrice and recurlyPrice 
GitOrigin-RevId: 38f4c51b9834c417824c0093096767f50e998cb8
 2022-01-21 09:03:16 +00:00
Eric Mc Sween
7446523205 Merge pull request #6358 from overleaf/jel-fix-de-ng-link 
[web] Fix modal link in plans FAQ

GitOrigin-RevId: 29137e71f5f0930443660086fb3a1cc3d87b05dd
 2022-01-20 09:04:09 +00:00
Alf Eaton
ee00ff3c44 [web] Add the meta[viewport] tag to all pages (#6301) 
* Always add the meta[viewport] tag
* Set metadata.viewport to false on projects list page
* Remove setting metadata.viewport = true
* Add viewport: false to editor page

GitOrigin-RevId: 6f9d4c1972e3e6fdf1b6c23cd17d57ba866fcaeb
 2022-01-20 09:03:48 +00:00
Thomas
4792208ed2 Merge pull request #6329 from overleaf/tm-wfh2021-ending-soon 
Update WFH offer notification text with offer end date

GitOrigin-RevId: f50b7f7f1b0c04ce20bd4ea45af6d8684f91fc2b
 2022-01-13 09:03:52 +00:00
Thomas
a3ab9468a4 Merge pull request #6169 from overleaf/tm-group-plan-upgrade-ui-changes 
Tweak group plan upgrade modal to match UI changes of marketing page group plans purchase modal

GitOrigin-RevId: 91db5de38fa4d273ae50924eec5db2b8e12ed7f9
 2022-01-12 09:03:41 +00:00
Thomas
5e61fce3b4 Enable additional currencies when purchasing (or upgrading to) a group plan (#4884) 
* Add script to fetch group data pricing from Recurly

* Update groups pricing data using script to fetch prices from Recurly

* Add additional currencies to saas settings

* Refactor group plans upgrade modal to use shared options from settings

GitOrigin-RevId: 6d13d5b152d01e0399f9d2b8f6f8bf99784589e8
 2022-01-12 09:03:21 +00:00
Miguel Serrano
2667e9a11c Unified Navigation Bar + Split Test (#5972) 
GitOrigin-RevId: 9fbde79aba1395956d591989b6161290777cc28f
 2021-12-03 09:03:27 +00:00
Hugh O'Brien
7d932f0b92 Merge pull request #5722 from overleaf/hb-improve-group-buy-ux 
Update the UX for the group subscription modal

GitOrigin-RevId: 6700a5c4907e0c966ee3b2954b6417ccf9edf37e
 2021-11-17 09:04:06 +00:00
Alexandre Bourdin
c881909258 Merge pull request #5716 from overleaf/ab-tear-down-de-ng-plans-page-test 
Tear down de-ng split test and cleanup old version

GitOrigin-RevId: 02438bbb2e530dfe72f046dd91c547d97c39c96e
 2021-11-09 09:04:51 +00:00
Thomas
ffdafb9700 Show prices including VAT in the upgrade to group subscription modal (#5463) 
* Add VAT calculation (with details) to the group upgrade modal

* Move 'per year' to seperate line to prevent text overflow

* Rename taxAmmount to taxAmount

GitOrigin-RevId: 37b7d471a704192d9cc4b96765f7449e747b2add
 2021-10-29 08:04:01 +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
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
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
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
bb882c697c Merge pull request #4288 from overleaf/jel-skip-to-content 
Add "Skip to content" to improve accessibility

GitOrigin-RevId: 43368a65057656bdea10b6be3c598d68bd8e2d40
 2021-07-28 02:06:54 +00:00
Jakob Ackermann
41471ec60f Merge pull request #4292 from overleaf/tm-handle-recurly-pricing-errors 
Handle Recurly pricing API errors and add coupon code error display

GitOrigin-RevId: b86a42a059984a7efa596db85bbcedb93c0e7376
 2021-07-28 02:05:54 +00:00
Alexandre Bourdin
3d5687a1f4 Merge pull request #4171 from overleaf/ta-remove-payment-page-form-fill 
Remove payment-page-form-fill Event

GitOrigin-RevId: 4befa04b9dd11906c93dd42693e08373f14b8cf0
 2021-06-11 02:06:09 +00:00
Alexandre Bourdin
551e2bfb5c Merge pull request #4084 from overleaf/ab-subscription-flow-events 
Subscription flow analytics events

GitOrigin-RevId: c74121031ba8623244657c607a76a513380e96f5
 2021-05-27 02:06:07 +00:00
Timothée Alby
88d00424cc Merge pull request #4002 from overleaf/cmg-subscriptions-new-validation 
Add missing validation messages on subscriptions new

GitOrigin-RevId: 451b75d4adb0d92911579f0ea728625c561b767f
 2021-05-20 02:05:11 +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
Thomas
682abe9ca5 Merge pull request #3980 from overleaf/tm-show-error-if-plan-change-fails 
Show error in plan change modal if plan change fails

GitOrigin-RevId: 698aab43feacdb5ced41f239167c5d132f7ca8de
 2021-05-18 02:08:20 +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
d2dad0d802 Merge pull request #4011 from overleaf/tm-fix-group-plan-educational-discount-text 
Lowercase 'educational' for consistency in group plan modal text

GitOrigin-RevId: 139549dc96e71295f1eb5949fad66af1b4df4e16
 2021-05-08 02:10:15 +00:00
Miguel Serrano
a5e905f730 Merge pull request #3975 from overleaf/tm-change-default-group-subscription 
Make Enterprise the default group pricing and clarify related text

GitOrigin-RevId: c723c87fa97ca0f8e9a03039f05cb397e1213de3
 2021-05-06 02:09:32 +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
Jakob Ackermann
d2e6449e79 Merge pull request #3897 from overleaf/tm-meta-tags-billing 
[views] migrate subscription templates to meta tags, re-issue

GitOrigin-RevId: c18bb7c96186cc8c34344ecf7cee35f9da19698e
 2021-04-16 02:05:27 +00:00
Shane Kilkelly
16d02c9d8b Merge pull request #3882 from overleaf/ab-wfh-ga-events 
Add new GA events to WFH2021 links

GitOrigin-RevId: 939f589c359a97b794eceb8e493cccd95ec1913a
 2021-04-10 02:05:09 +00:00
Jessica Lawshe
2fca78eaf0 Merge pull request #3896 from overleaf/revert-3834-tm-meta-tags-billing 
Revert "[views] migrate subscription templates to meta tags"

GitOrigin-RevId: 8ab3dae6e3aa359b6d7aa69df70a1b1eb2405dfd
 2021-04-09 02:05:33 +00:00
Jessica Lawshe
e697064f16 Merge pull request #3834 from overleaf/tm-meta-tags-billing 
[views] migrate subscription templates to meta tags

GitOrigin-RevId: 4e81e81380048436a011467c230cc54c02e0c423
 2021-04-09 02:05:29 +00:00
Eric Mc Sween
5587de9cf5 Merge pull request #3833 from overleaf/em-meta-tags 
Pass values to JS through meta tags

GitOrigin-RevId: f663a1b7fef4544b560574d21f59fdabaf617830
 2021-04-01 02:05:44 +00:00