Jimmy Domagala-Tang
d6cd041704
Merge pull request #25505 from overleaf/jdt-redirect-to-wf-based-on-prem-src
...
Manage on Writefull should provide the right instructions based on premiumSource
GitOrigin-RevId: bc6dcc5962d18220c445315acbb3b4040ff23d5d
2025-05-22 08:08:01 +00:00
Domagoj Kriskovic
ab37e18bc3
Update AI Assist wording on checkout page if not in rollout ( #25689 ) ( #25733 )
...
* Update AI Assist wording on checkout page if not in rollout
* update wording when buyin addon
GitOrigin-RevId: 7133b4fd3efac8e8a7361dcc15d54367f809f16d
2025-05-20 08:05:36 +00:00
Domagoj Kriskovic
996c407393
Revert "Update AI Assist wording on checkout page if not in rollout ( #25689 )" ( #25726 )
...
This reverts commit 20a90b14e97b1a8837e8be697c1a9666ed15a1c3.
GitOrigin-RevId: 26d4ad8f1b3a7dbe884dfbe4f4be5ee632abed1e
2025-05-19 12:26:35 +00:00
Domagoj Kriskovic
d7ef7f0399
Update AI Assist wording on checkout page if not in rollout ( #25689 )
...
* Update AI Assist wording on checkout page if not in rollout
* update wording when buyin addon
GitOrigin-RevId: 20a90b14e97b1a8837e8be697c1a9666ed15a1c3
2025-05-19 12:26:26 +00:00
Rebeka Dekany
3ef62472bd
Fix back to your projects button ( #25500 )
...
GitOrigin-RevId: 98f84593bec190b24a225d4690414e4e9f1141e0
2025-05-16 08:06:48 +00:00
Tim Down
5c4cb50628
Merge pull request #24988 from overleaf/td-bs5-upgrade-and-rename
...
Apply minor upgrades to Bootstrap 5 and react-bootstrap
GitOrigin-RevId: eb013f38515ebd4b9572d139f00841aca344e3c6
2025-05-16 08:05:28 +00:00
Jimmy Domagala-Tang
443fb3f152
Merge pull request #24739 from overleaf/dk-thankyou-page
...
Update "thanks for subscribing page" with AI Assist links
GitOrigin-RevId: 41a23d6fd5edfc8f9ad0f97e513e1ea66aed5bdc
2025-05-14 08:06:44 +00:00
Jimmy Domagala-Tang
82e5b2c5d7
Merge pull request #25151 from overleaf/dk-use-user-features
...
UserFeaturesContext with cross-tab syncing via BroadcastChannel
GitOrigin-RevId: 4262719f5018f5717211851ce28b3255af65461a
2025-05-13 08:07:57 +00:00
Kristina
70c26b6ed2
[web] prevent downgrade to personal upsell for stripe subscriptions ( #25392 )
...
GitOrigin-RevId: a954f42e1159e4bcc8fd06f5f6df9a53c67f9f90
2025-05-13 08:06:05 +00:00
ilkin-overleaf
2ccdb74d20
Merge pull request #25318 from overleaf/ii-flexible-licensing-manually-collected-3
...
[web] Add seats feature for manually collected subscriptions improvements
GitOrigin-RevId: 4fbd93097590d97ad6464d1988471a78bf7cb9e2
2025-05-09 08:05:07 +00:00
Jimmy Domagala-Tang
9f0f910a83
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
Jimmy Domagala-Tang
fbbba7a3df
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
Jimmy Domagala-Tang
f29bd47911
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
Domagoj Kriskovic
473f767465
Update event tracking for AI assist payment flow ( #25222 )
...
GitOrigin-RevId: feb7987b1397d70b3a04c797bd2db92e42c325f5
2025-05-06 08:04:56 +00:00
Tim Down
7abafb01ea
Merge pull request #23940 from overleaf/td-react-18
...
Upgrade to React 18
GitOrigin-RevId: 9b81936e6eea2bccd97fe5c2c5841f0b946371b8
2025-05-02 08:05:29 +00:00
Domagoj Kriskovic
53c34b5726
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
Kristina
23c1a0ba4d
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
Kristina
6166a51552
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
Jimmy Domagala-Tang
f95bf41824
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
Kristina
9f22564ca3
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
Jimmy Domagala-Tang
f7f4a03abb
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
Kristina
7920cd9d3d
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
Tim Down
28468e134c
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
ilkin-overleaf
3b5a148cdc
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
ilkin-overleaf
fef5ab7255
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
ilkin-overleaf
b223bb8da8
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
ilkin-overleaf
61ce012fb5
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
Tim Down
c2da12939e
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
Tim Down
48e0bc28f8
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
Thomas Mees
84996ea88c
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
Davinder Singh
7ec4cbd841
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
Eric Mc Sween
1ea577ef12
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
Davinder Singh
37dc516ea2
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
Davinder Singh
3784061935
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
Eric Mc Sween
4ccc21ca85
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
Davinder Singh
3851ee4eb2
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
Antoine Clausse
d9a9fbb242
[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
ilkin-overleaf
bebc32b11d
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
Eric Mc Sween
761c184c8f
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
ilkin-overleaf
f032b47744
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
ilkin-overleaf
58ece71c7a
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
ilkin-overleaf
93dd1fea2d
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
ilkin-overleaf
61ddc73d87
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
Liangjun Song
12494acdf7
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
Liangjun Song
5facec8ed2
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
Liangjun Song
ad9b409cf9
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
ilkin-overleaf
4a927e45a6
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
roo hutton
864599b325
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
roo hutton
50f5a4e909
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
roo hutton
347cade55f
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
