Commit graph

37 commits

Author SHA1 Message Date
Jimmy Domagala-Tang
19dc975e3a Merge pull request #21699 from overleaf/jdt-hide-cancel-addon-when-cancelled-already
[Web] Handle add-on cancellation states on subscriptions page

GitOrigin-RevId: 2b834df6747560d54b7dc22e3870ee7a7e236498
2024-11-14 09:05:32 +00:00
Jimmy Domagala-Tang
9818912cb7 Merge pull request #20968 from overleaf/jdt-subscription-page-addons
feat: add all add-ons to price calculation in subs view model
GitOrigin-RevId: d03374192d735278c6459fc6341a72d0b0c7c3aa
2024-11-05 09:05:49 +00:00
Rebeka Dekany
850bbceab6 Merge pull request #21238 from overleaf/rd-github-sync
Migrate the Github Sync modal to Bootstrap 5

GitOrigin-RevId: a6178fc2e9c7072d28d0a1b094b42dff12944781
2024-11-04 09:05:14 +00:00
Jimmy Domagala-Tang
d002c25ed1 Merge pull request #21009 from overleaf/jdt-fix-assistant-plan-naming
Set Assist

GitOrigin-RevId: 0da509cbebd833da0d2dac648bce988191279c99
2024-10-14 11:10:37 +00:00
Jimmy Domagala-Tang
aa9a246346 Merge pull request #20571 from overleaf/jdt-ai-addon-personal-upgrade
Enable purchasing an AI add-on for users on a monthly collaborator plan

GitOrigin-RevId: 988547bf6f01f7c1477191dd202df4448e376e5f
2024-10-14 11:09:04 +00:00
ilkin-overleaf
92eade7502 Merge pull request #20708 from overleaf/ii-bs5-pdf-toolbar
[web] BS5 pdf toolbar

GitOrigin-RevId: a04091c9e936e52f47c3977b3149ffe613d43bb9
2024-10-14 11:06:17 +00:00
roo hutton
551de499d5 Merge pull request #20802 from overleaf/rh-change-personal-plan
[web] Remove personal plans from 'change plans' table

GitOrigin-RevId: 284573cf3d5d38b1964d10fe6451b1468c90ff84
2024-10-14 11:02:24 +00:00
Antoine Clausse
9997c4874f [web] Migrate /user/subscription to BS5 (#20513)
* [web] Initialize BS5 in subscription page

* [web] Update subscription-dashboard.tsx for BS5

* [web] Update row-link.tsx for BS5

* [web] Update modals

* [web] Add `btn` to `btn-inline-link` classes

* [web] Update circle change-to-group circle price element

* [web] Replace `list-item-with-margin-bottom` with `mb-3`

* [web] Update form elements to BS5

* [web] Use `useContactUsModal`

* [web] Adjust tables margin/padding, and more

* [web] Update change-to-group-modal.tsx

* [web] Add gap to subscription buttons

* [web] Remove subscription page colspan for md and above

* [web] Use Notification component

* [web] Update "leave group" buttons

* [web] Fix tests: add `ol-user` meta tag

* [web] Nest .hover-highlight in #subscription-dashboard-root

* [web] Update to OLRow/OLCol

* [web] Update to OLButtons

* [web] Update to OLFormGroup

* [web] Naming: use BSversion prefix

* [web] Set CancelSubscriptionButton as ghost directly in component

* [web] Set "Plan" font size

* [web] Simplify cancel-subscription buttons

* [web] Remove `--neutral-10` ModalFooter background

* [web] Simplify circle styles

* [web] Center discount badge

* [web] Update fieldset label

* [web] Add `<ul>` around RowLink

* [web] Define SCSS for row-link component

* [web] Remove some use of utility classes

* [web] Revert and update `fieldset` changes (fixes tests)

* [web] Fixup some more OLButtons

* [web] Fixup use of OLRow/OLCol

* [web] Reduce spacing below "legend-as-label"

* [web] Use h5 instead of small in OLModalTitle

* [web] Revert OLCol removal on lg screens

I had removed them by mistake because I wasn't using the proper breakpoints

* [web] Add backdrop to nested modal ContactUsModal

* [web] Don't prefill project URL in ContactUsModal

* [web] Fix lint

* [web] Share `className` prop in BS5 and BS3 modals

* [web] Set sub-title font sans serif (BS3)

* [web] Update remaining Alerts to OLNotification

GitOrigin-RevId: 7fd975ae3e992cebfaf71d4e182f8e13ec886d09
2024-10-01 08:05:14 +00:00
Eric Mc Sween
918d0f24eb Merge pull request #20547 from overleaf/em-assist-plan
Add a button for buying standalone Overleaf Assist

GitOrigin-RevId: 50baea48ea990eba38ef564b71a79a76bbd45dfc
2024-09-30 08:04:52 +00:00
Thomas
a16db120c0 Implement free trial limits (#19507)
* Add additional validations for subscription trials

GitOrigin-RevId: 1cb821c62e02d3eaa5b2bcacaee63b6bc7a63311
2024-08-08 08:05:05 +00:00
Jakob Ackermann
aa480a2663 Merge pull request #18898 from overleaf/jpa-no-window
[web] migrate from window attributes to getMeta

GitOrigin-RevId: 3dcf1ab6b01155e5e4abeb3e78d0fa9053e055bc
2024-06-19 08:04:21 +00:00
Antoine Clausse
2f99e3ccf1 Add autoComplete="off" to React-controlled checkboxes (#18212)
Fixes https://github.com/overleaf/internal/issues/18144

Browsers use a [bfcache](https://web.dev/articles/bfcache) (Back/forward cache) which restores form data on navigation. Unfortunately, it causes checkbox appearances not to respect our React states.

Setting `autoComplete="off"` on checkboxes mitigates this problem. (From https://stackoverflow.com/questions/299811/why-does-the-checkbox-stay-checked-when-reloading-the-page)

Another solution could be to set a `Cache-Control: no-store` header, but this might additionnal undesired consequences.

GitOrigin-RevId: 7d3cceb1c818ad70de7e806ea6d714ffc8bffb4a
2024-05-06 08:04:39 +00:00
Thomas
24023dd267 Merge pull request #15901 from overleaf/tm-design-system-updates-teardown
Design system updates test tear down and clean up

GitOrigin-RevId: 743423f7c31c0ba89093bba0107d7e6799e1c309
2023-11-28 09:04:06 +00:00
Alf Eaton
221d16f4e4 Disable transSupportBasicHtmlNodes in react-i18next config (#15430)
* Set transSupportBasicHtmlNodes to false
* Update ESLint rule
* Convert Trans to t
* Convert shouldUnescape={true}
* Convert some arrays to objects
* Update translations

GitOrigin-RevId: 64a50318388abcada408f72d949de148129a9f63
2023-10-31 09:04:04 +00:00
Alf Eaton
0c81bccfca Ensure that translation values are correctly escaped (#15252)
GitOrigin-RevId: 5a38b4c01921fd4d95dbdb7b9e756443fdb00b80
2023-10-20 08:03:31 +00:00
Jakob Ackermann
1213709578 Merge pull request #14980 from overleaf/jpa-debug-console
[web] migrate frontend logging to debugConsole

GitOrigin-RevId: b03ff9030b03fff059738d2270bc4b4912e79f16
2023-09-28 08:04:12 +00:00
ilkin-overleaf
c6289cc67f Merge pull request #14773 from overleaf/ii-modify-design-system-update-split-test
[web] Modify design-system-update split test

GitOrigin-RevId: f28aeef5ba782006afd30fd2862d0ad129077f6c
2023-09-18 08:03:49 +00:00
Thomas Mees
1cde138160 Move premium features link outside the subscription block
GitOrigin-RevId: b88d765d859f1bdf1eb1d469131c8f239f327562
2023-09-06 08:05:47 +00:00
Thomas
6a9c9652f9 Merge pull request #14007 from overleaf/tm-subscription-active-until-trial-ends
Show cancelled subscription will remain active until end of trial

GitOrigin-RevId: 277f477dc95869ff61cbb48cb2033ec55db3cf52
2023-08-09 08:04:28 +00:00
Alf Eaton
f375362894 Always use mockable location methods (#11929)
* Always use mockable location methods
* Add eslint rules for window.location calls/assignment
* Add useLocation hook
* Update tests

GitOrigin-RevId: eafb846db89f884a7a9a8570cce7745be605152c
2023-03-17 09:05:21 +00:00
Jessica Lawshe
b10b7b1f91 Merge pull request #12042 from overleaf/jel-change-plan
[web] Change plan UI now in a modal and update the style

GitOrigin-RevId: 1b501b4a972ca676cff32f531862c15c0c8f9e61
2023-03-09 09:05:05 +00:00
ilkin-overleaf
612728d300 Merge pull request #11963 from overleaf/ii-react-subscription-dash-reactivate-subscription
[web] Subscription dash reactivate button react migration

GitOrigin-RevId: dde8dd1abb8979bdf90d71ea07e1336e9af491b3
2023-03-01 09:03:17 +00:00
Jessica Lawshe
7469f01acd Merge pull request #11981 from overleaf/jel-downgrade-when-cancel
[web] Migrate downgrade plan option when cancelling in React subscription dash

GitOrigin-RevId: 11a4b39deb58493f3f56e65e8760d71527a8e8fc
2023-02-28 09:03:54 +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
a928fd20e6 Merge pull request #11906 from overleaf/ii-react-subscription-dash-active-coupons
[web] Subscription dash show active coupons react migration

GitOrigin-RevId: 7a63505b31d828491b6ea812482376882354b4ee
2023-02-23 09:04:13 +00:00
Jessica Lawshe
89ef1681e8 Merge pull request #11844 from overleaf/jel-subscription-dash-change-to-group-submit
[web] Submit group plan change on subscription dash

GitOrigin-RevId: 5bc2644351c80189774ad3ac4cdcd622d354770f
2023-02-22 09:05:21 +00:00
Jessica Lawshe
124306d7ac Merge pull request #11819 from overleaf/jel-subscription-dash-change-to-group-prices
[web] Show price in change to group plan modal on React subscription dash

GitOrigin-RevId: 6a1a4be3a7d008cd9e26186c2d97bc0bdc2f82ed
2023-02-22 09:05:13 +00:00
Jessica Lawshe
cad3660f0b Merge pull request #11839 from overleaf/jel-subscription-dash-change-to-group-pt2
[web] Continue change to group plan via React subscription dash

GitOrigin-RevId: b7e743f18e40383ecc1dbf02914f663ff0bc1846
2023-02-22 09:05:05 +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
Jessica Lawshe
d539aaf226 Merge pull request #11681 from overleaf/jel-confirm-subscription-change
[web] Plan change request in subscription dash

GitOrigin-RevId: 9afe22b2da035f887c6fa9abe8129711d492108c
2023-02-17 09:05:51 +00:00
Jessica Lawshe
f3d055af86 Merge pull request #11619 from overleaf/jel-react-personal-subscription-dash-change-plan
[web] Query display price data for change plan UI in React subscription dash

GitOrigin-RevId: e05779d1f289ee55a1b8be17b182905fca66e44f
2023-02-08 09:06:44 +00:00
Jessica Lawshe
c7d8e4867d Merge pull request #11560 from overleaf/jel-react-personal-subscription-dash-pt-5
[web] Continue migration of personal subscription dash to React

GitOrigin-RevId: fb327592ad5031bff20b2a95a83edee4735112e8
2023-02-08 09:06:29 +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
Jessica Lawshe
df532c9737 Merge pull request #11494 from overleaf/jel-react-personal-subscription-dash-pt-3
[web] Continue migration of personal subscription dash to React

GitOrigin-RevId: 412301dad0a04fa6e7b8712ad919c4f67d0bbfe2
2023-02-01 09:05:35 +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
Jessica Lawshe
2499ecadcc Merge pull request #11340 from overleaf/jel-react-personal-subscription-dash
[web] Begin to migrate personal subscription dash commons to React

GitOrigin-RevId: 43c096bd72199c8c0a7b40c8fd84a0a12c108217
2023-01-27 09:05:22 +00:00