a4cfecb2aa
Merge pull request #25251 from overleaf/jdt-show-wf-provided-bundle-on-free-plans
...
Show AI Assist entitlment via Writefull on free user's subscriptions page
GitOrigin-RevId: 20a456a231f60df279b949057972125735166904
2025-05-08 08:06:14 +00:00
54505437d4
Merge pull request #24816 from overleaf/jdt-update-checkout-for-bundle
...
Update checkout pages for AI Assist bundle content
GitOrigin-RevId: e2e1b705dd92e0858835d18eb6d8c5750030e550
2025-05-08 08:06:09 +00:00
d798dbec01
Merge pull request #25252 from overleaf/jdt-add-addon-to-cancellation-mssg-in-subs
...
Show Assist Add-on for pending and cancelled subscriptions
GitOrigin-RevId: df733d7078c231a5de989bc070b37e3c250fdb37
2025-05-07 08:07:20 +00:00
e0e4f7e11b
Update event tracking for AI assist payment flow ( #25222 )
...
GitOrigin-RevId: feb7987b1397d70b3a04c797bd2db92e42c325f5
2025-05-06 08:04:56 +00:00
aae0d42002
Merge pull request #23940 from overleaf/td-react-18
...
Upgrade to React 18
GitOrigin-RevId: 9b81936e6eea2bccd97fe5c2c5841f0b946371b8
2025-05-02 08:05:29 +00:00
a46fef3ec0
Add "referrer" tracking to payment flows for AI assist ( #25002 )
...
* Add "referrer" tracking to payment flows for AI assist
* move sendMB call
* fix conflict
GitOrigin-RevId: 0c4480816d5fe525a87223c0b1827093d853d474
2025-04-29 08:05:41 +00:00
a926fd7dc5
Merge pull request #25082 from overleaf/kh-prevent-pausing-and-group-plans
...
[web] prevent pausing or upgrading to group for Stripe subscriptions
GitOrigin-RevId: 4d194339282d8bc165ffa1b89e8e1cf298c2d343
2025-04-29 08:05:09 +00:00
ebc9139a36
Merge pull request #24922 from overleaf/kh-add-customer-portal-links
...
[web] add stripe customer portal link
GitOrigin-RevId: 6baaf51d4dd89ef779229ad17603529db06cf396
2025-04-24 08:05:44 +00:00
7b6fd9a24e
Merge pull request #24697 from overleaf/jdt-show-addons-via-wf
...
Display When Ai Assist Is Granted Via Writefull
GitOrigin-RevId: 91f6e1843e2e1d1f7b3a49d95f31603e838c5545
2025-04-23 08:05:30 +00:00
36fcc401cc
Merge pull request #24680 from overleaf/kh-rename-recurly-namespace
...
[web] rename recurly namespace
GitOrigin-RevId: b7cfd26923d47bd7f3de4140be24d2d1ef20f6c8
2025-04-11 08:05:20 +00:00
3978c091db
Merge pull request #24523 from overleaf/jdt-prevent-bundle-dbl-buys
...
Redirect bundle purchases when users already have it
GitOrigin-RevId: d8e3c0256db08c08c2be24f38caef91fb26b90e8
2025-04-10 08:06:28 +00:00
1ee30f8683
Merge pull request #24519 from overleaf/kh-add-payment-service-low-delta
...
[web] add `PaymentService` to `buildUsersSubscriptionViewModel`
GitOrigin-RevId: 543531226bad38d34b225dae28cf00a5e02e5558
2025-04-10 08:05:06 +00:00
3f4e975e92
Merge pull request #24660 from overleaf/td-bs5-remove-react-bootstrap-0
...
Remove react-bootstrap 0.33.1
GitOrigin-RevId: c320a6b18c576afdc0fd49559915d3d2f3a7a1ef
2025-04-10 08:04:50 +00:00
1fc8019b01
Merge pull request #24634 from overleaf/ii-flexible-group-licensing-replace-add-with-purchase
...
[web] Replace "add" with "buy" in FL
GitOrigin-RevId: 2c9aa50f138306a46ebfd8557d907c6c55d694bc
2025-04-03 08:05:12 +00:00
1337af755c
Merge pull request #24562 from overleaf/ii-bs5-group-settings-tear-down
...
[web] Group settings BS5 feature flag tear down
GitOrigin-RevId: c83297771dfeeb0426096b3b0765d6c420356d2a
2025-04-02 08:05:14 +00:00
bb1ba24afe
Merge pull request #24576 from overleaf/ii-flexible-group-licensing-replace-users-with-licenses
...
[web] Replace "users" with "licenses" in flexible licensing
GitOrigin-RevId: c262f802c92e7ce82f8dc60badf8e6147c5da4e5
2025-03-31 08:04:50 +00:00
e5ddc9e1f6
Merge pull request #24430 from overleaf/ii-flexible-group-licensing-tear-down-feature-flag
...
[web] Tear down flexible group licensing feature flag
GitOrigin-RevId: 181713f1f2371b51cbc4256debea59bbcf3668f3
2025-03-31 08:04:42 +00:00
36f7170cff
Merge pull request #24313 from overleaf/td-ac-bs5-frontend-tests
...
Update front-end tests to use Bootstrap 5
GitOrigin-RevId: abaa09f8c0639d64d6ade97468ab16204e5de97b
2025-03-24 10:48:20 +00:00
5d565d61a9
Merge pull request #24365 from overleaf/td-bs5-misc-clean-up
...
Remove BS3 code from a couple of places
GitOrigin-RevId: 110a8f4c96a5418da27be11471d2e93bb7e01ee8
2025-03-24 10:47:02 +00:00
1e7a4c5582
Implement checks for user eligibility when switching plans ( #24276 )
...
* Convert updateSubscription controller to async/await
* Move updateSubscription to subscription module
* Validate if user is eligible to change plan
GitOrigin-RevId: ce538429cd5a3b93acabdc046f1a8b164ac02301
2025-03-14 09:05:19 +00:00
baa5b76ddb
Merge pull request #24164 from overleaf/ds-group-discount-10-percent-february
...
Group plans - Reintroduce 10% discount for group plans (Part 1, 2 & 3 Combined)
GitOrigin-RevId: f3a59a65bbd300cc06f70e179e794c32ed7970ce
2025-03-11 09:05:50 +00:00
6d1940baf5
Merge pull request #24154 from overleaf/em-bs5-subscription-preview
...
Migrate the subscription change preview page to BS5
GitOrigin-RevId: beb398ef3a81be1b8d35536c524af6c110ea1b3d
2025-03-11 09:05:46 +00:00
de4785fac4
Merge pull request #24148 from overleaf/revert-24066-ds-group-discount-2
...
Revert "Group plans - Reintroduce 10% discount for group plans (part 2)"
GitOrigin-RevId: 2d8a8d117222daa997e4d0632a9e7235559a8b8c
2025-03-07 09:06:35 +00:00
e992726134
Merge pull request #24066 from overleaf/ds-group-discount-2
...
Group plans - Reintroduce 10% discount for group plans (part 2)
GitOrigin-RevId: ea5d600d901329944092daf560a015ac8ca10cd3
2025-03-07 09:06:05 +00:00
f5a386261c
Merge pull request #24046 from overleaf/em-cdn-assets
...
Load assets from the CDN in selected pages
GitOrigin-RevId: c2b25f74e30c0ce47e486855dee3815d72d43d47
2025-03-06 09:05:23 +00:00
793d473aba
Plans Group Size - Removing the 50 size ( #23851 )
...
* removing the group size 50
* removing the if condition for 20/50 groups
* running make cleanup_unused_locales
* removing instances of sizesForHighDenominationCurrencies and the related if conditions
* removing the price related to group size of 50 in different currencies
* fixing the test
* changing the 50 to 20 under faqs
* changing the remaining 50 to 20
* cleaning of variables
* removing extra variable
GitOrigin-RevId: 68f5d7df1eab29360e9c806ad844f1c900341c19
2025-02-28 09:04:51 +00:00
98b7b1b7cd
[web] Fix button-link loading state in subscription page ( #23640 )
...
* Fix inline loading button style
* Fix frontend test
GitOrigin-RevId: 59cdf68b8f2ad50f042a4457dc37f5c3d33d6c87
2025-02-26 09:04:58 +00:00
d4d1a23a1c
Merge pull request #23547 from overleaf/ii-flexible-group-licensing-error-assist-2
...
[web] Hide flexible licensing buttons for pending plans (fix)
GitOrigin-RevId: ce5b4ce4138ed7a029b840a87c5498227e3204f4
2025-02-13 09:04:57 +00:00
61493ae7e1
Merge pull request #23540 from overleaf/revert-23483-ii-flexible-group-licensing-error-assist
...
Revert "[web] Hide flexible licensing buttons for pending plans"
GitOrigin-RevId: 6e19c2ae2663fc0cf3335e9517e80a1eee9e2659
2025-02-12 09:05:46 +00:00
9d344c4af9
Merge pull request #23508 from overleaf/ii-flexible-group-licensing-change-plan-cta
...
[web] Subscription page change plan cta
GitOrigin-RevId: aa1ae2e00cbe49fb2f661204025ef4c32393b457
2025-02-12 09:05:16 +00:00
2bb9bdea66
Merge pull request #23483 from overleaf/ii-flexible-group-licensing-error-assist
...
[web] Hide flexible licensing buttons for pending plans
GitOrigin-RevId: 8e9b65ae9b68cdd838442e8b45f3bd8f22e72349
2025-02-12 09:05:11 +00:00
fdb48eaacc
Merge pull request #23498 from overleaf/ii-flexible-group-licensing-paused-subscription
...
[web] Paused subscription support
GitOrigin-RevId: 76482011f9a75786722b4cc0c074e8c2ac3d6fb4
2025-02-12 09:05:07 +00:00
40f4b5bee7
Merge pull request #23488 from overleaf/ls-display-add-on-with-pending-cancellation
...
Display addOn that has pending cancellation
GitOrigin-RevId: 5fde493d1b706a1708e0cb4a2de6a7682fb1d1e0
2025-02-12 09:05:02 +00:00
b97d8de8f7
Merge pull request #23463 from overleaf/ii-flexible-group-licensing-supported-users-copy
...
[web] Subscription page additional licenses copy
GitOrigin-RevId: 5e14792798195718a98ee1efae1a964037a32b62
2025-02-10 09:05:25 +00:00
c557a1c2c0
Merge pull request #23238 from overleaf/ls-analytic-events-for-flexible-licensing
...
Implement analytic events for flexible licensing
GitOrigin-RevId: 2ac0b471616d6e4f80ade18934d7240618195a8a
2025-02-07 09:05:48 +00:00
4bba1437a0
Merge pull request #23439 from overleaf/ii-flexible-group-licensing-subscription-add-on
...
[web] Add-on cancel button
GitOrigin-RevId: bdbcbf8820aa683f7bdb365eca331aa71455b687
2025-02-07 09:05:20 +00:00
f166e9263c
Merge pull request #23117 from overleaf/ii-flexible-group-licensing-subscription-page
...
[web] Subscription page for flexible licensing
GitOrigin-RevId: 8f2fab1fc01e27063d716a86add66b1b9a72cbe6
2025-02-05 09:05:54 +00:00
8246195088
Merge pull request #23172 from overleaf/rh-pause-pending-plan-change
...
Don't offer subscription pause if plan change is pending
GitOrigin-RevId: e91897fab2d003dc3ef7486e609a8b907e376a1f
2025-02-04 09:04:41 +00:00
11bc20c950
Merge pull request #23161 from overleaf/rh-pause-no-plan-change
...
Prevent downgrade to personal plan during subscription pause
GitOrigin-RevId: e3ba2e8e4d9b909fa2ee9c3c7e15db2ed257e43b
2025-01-31 09:04:58 +00:00
83012e0961
Merge pull request #23177 from overleaf/rh-pause-tracking
...
Add tracking for subscription-pause-scheduled event
GitOrigin-RevId: 802899e53d22f2be49f2d20adb45a4a47d0f6beb
2025-01-31 09:04:53 +00:00
c1b8bfd73c
Merge pull request #21905 from overleaf/rh-pause-sub
...
Add support for pausing subscription
GitOrigin-RevId: f939ea4e7f3c2b1fa16dcb8aff1b2460d091d4e2
2025-01-23 09:06:04 +00:00
39fdc71cf5
Merge pull request #22821 from overleaf/kh-cop-on-upgrade-modal
...
[web] limit COP group plans to 20 seats in upgrade modal
GitOrigin-RevId: b1d2713b978d0269892d8f547eeccc5ab702ea77
2025-01-16 09:06:37 +00:00
218c376f37
[web] tear down group-pricing-2025 split test on non-plans pages ( #22785 )
...
* [web] rm split test from the change to group modal
* [web] rm split test from cancel flow
* [web] rm split test from checkout flow
* [web] rm unused translations
GitOrigin-RevId: 0188f2631ed18e79fdf55dabedac7cdea4f213d3
2025-01-16 09:05:22 +00:00
8f21f58ad5
Merge pull request #22340 from overleaf/mf-clean-up-currency-format-test
...
[web] Clean up localized currency format test (`local-ccy-format-v2`)
GitOrigin-RevId: 30d671479522b87ee9205994508b745d2b0ae4c3
2025-01-14 09:05:49 +00:00
e9dd128371
[Group Pricing] Add price change warning to cancellation flow ( #22640 )
...
* Add price change warning to cancellation flow
* Fixes lint error from translated string
* update pricing effective date
---------
Co-authored-by: Kristina Hjertberg <kristina.hjertberg@overleaf.com >
GitOrigin-RevId: d1b6982ff437d931144feffddcbddd96f5a3405b
2025-01-07 09:04:36 +00:00
e8805f6cd7
[web] Update change plan flow for group-pricing-2025 ( #22532 )
...
GitOrigin-RevId: 23f6f5972b1d13b457c7c5e88f508b7cf022469a
2024-12-18 09:06:38 +00:00
5e65f9460c
Merge pull request #22503 from overleaf/em-overleaf-assist
...
Rename last mentions of Overleaf Assist to Error Assist
GitOrigin-RevId: 83170de1bcf494955138f8ff6484f3fba9c1ea9b
2024-12-18 09:05:39 +00:00
da7d28ad6f
Merge pull request #22330 from overleaf/jdt-split-preview-charges
...
feat: splitting immediate charges into pre and post tax
GitOrigin-RevId: 67c96e7dbc4dbf0d73f62242b9710532f633dbef
2024-12-11 09:04:52 +00:00
98d8645025
Merge pull request #22259 from overleaf/jdt-assist-wording
...
Add unlimited to assist plan wording
GitOrigin-RevId: a15f10e618ab11f36f55c091d36dc4e61bff49d6
2024-12-05 09:05:10 +00:00
8bea077b93
Merge pull request #22163 from overleaf/em-subscription-page-ai-add-on
...
Adapt the Your plan entry on the subscription page to groups and Commons
GitOrigin-RevId: 7352a90d2489de48d2711f2b8a364cdd5bb54eeb
2024-11-29 09:04:59 +00:00
Jimmy Domagala-Tang