Commit graph

2849 commits

Author SHA1 Message Date
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
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
Tim Down
fef395f431 Fix layout shift by nearly always applying overflow-y hidden on review panel (#8174)
* Always hide vertical overflow on the review panel, not just when it's expanded, which prevents it scrolling slightly when scrolling the PDF in some circumstances
* Fix layout shift by always applying overflow-y hidden on review panel and make entry visible in minimized review panel by making the overflow visible while hovering over the entry

GitOrigin-RevId: 854ee47a762ee2cf78fbbb5856afddb3b723d679
2022-06-13 08:03:37 +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
4f127f8408 Add new "Premium Features" link on the navbar "Features & Benefits", and hide it behind the "premium-features-discoverability" split test (#8269)
GitOrigin-RevId: 5dae86818a485c74078683422ec44008fd754f27
2022-06-06 08:03:41 +00:00
Eric Mc Sween
2ab5189771 Merge pull request #8237 from overleaf/em-halt-on-error
Stop on first error dropdown UI

GitOrigin-RevId: 5191a37f6c227ff5a91c10ce965832e1702c3931
2022-06-03 08:03:39 +00:00
Thomas
5e2933e2fe Merge pull request #8240 from overleaf/tm-teardown-persistent-upgrade-test
Teardown persistent upgrade prompt split test and fix styling

GitOrigin-RevId: 8776231c3308c5f08b91232c962c9796a5f4afa0
2022-06-02 08:02:45 +00:00
M Fahru
df35a67707 fix typo, change recomendedCurrency to recommendedCurrency (#8245)
GitOrigin-RevId: 16d40113d73de10082c3cc7fcb9bd54bbaf5a274
2022-06-02 08:02:40 +00:00
Timothée Alby
c66278cf89 Merge pull request #8148 from overleaf/ta-pr-dictionary-style
Polish Dictionary Modal UI

GitOrigin-RevId: 48aceb56c84a218380c619ecc5cd527f5062d3c4
2022-05-27 08:04:16 +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
Miguel Serrano
430b7528b2 Merge pull request #8073 from overleaf/ta-td-dictionary
Add UI to Remove Words from Dictionary

GitOrigin-RevId: a28d865e3c968d6fff113237fcf4143b77af046e
2022-05-25 08:09:45 +00:00
Alf Eaton
1f24160005 Switch layouts using custom divider toggle (#7995)
GitOrigin-RevId: 15e517f448165a25df616fd956967202491b15cc
2022-05-23 08:03:30 +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
dependabot[bot]
2b2e9cfe45 Bump sanitize-html from 1.27.3 to 2.7.0 in /services/web/scripts/translations (#6651)
* [web] scripts/translations: update package-lock to version 2

* Bump sanitize-html in /services/web/scripts/translations

Bumps [sanitize-html](https://github.com/apostrophecms/sanitize-html) from 1.27.3 to 2.7.0.
- [Release notes](https://github.com/apostrophecms/sanitize-html/releases)
- [Changelog](https://github.com/apostrophecms/sanitize-html/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apostrophecms/sanitize-html/commits/2.7.0)

---
updated-dependencies:
- dependency-name: sanitize-html
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* [web] adapt locales escaping and usage for new sanitize-html version

Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
GitOrigin-RevId: 5df107a0a4b3d7c408f676ee363169f0ef0de28f
2022-05-18 08:04:19 +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
Timothée Alby
4b87568e4f Merge pull request #7810 from overleaf/ta-settings-intermediate-pages
[SettingsPage] Github and Dropbox Linking Flow Improvements

GitOrigin-RevId: 4fd69e7e3a8989b2478299751582007635f9e0b0
2022-05-17 08:03:29 +00:00
Timothée Alby
c043db0ed9 Merge pull request #7792 from overleaf/ta-settings-fixes-4
[SettingsPage] Wording and Error Handling

GitOrigin-RevId: 1e2445a68e0d32cbec558832892f2ce5a051d729
2022-05-17 08:03:23 +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
Copybot
bbccff33fa Merge pull request #996 from Victrid:patch-1
GitOrigin-RevId: 20532c2a48a28bbda141588963a3693d5ca3fbb6
2022-05-12 10:40:55 +00:00
Miguel Serrano
d91fada6fe Merge pull request #7913 from overleaf/msm-remove-beta-server-pro
[Settings] Remove beta section from Server Pro

GitOrigin-RevId: b85b1c675e3f45c6a8f5c77bb51ba9b86ee1b764
2022-05-12 10:40:47 +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
Alf Eaton
3a81428ef3 Merge pull request #7795 from overleaf/ae-history-view
Avoid switching away from v1 history view when a file is selected

GitOrigin-RevId: 7b7d75f5e4c63bf899fc7f1f5c7c17119863177b
2022-05-10 08:03:54 +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
8472ac6fc6 Add split test for persistent upgrade prompts project dash and editor header (#7590)
* Add Upgrade buttons on project dash and editor header

GitOrigin-RevId: 16325ffb2e63beeaff914e0b95db3faddcdf241a
2022-04-28 08:04:32 +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
Alf Eaton
d6f8d43b0f Suppress footer on full-size pages (#7631)
GitOrigin-RevId: 0db7ec4de9b087adc093d5ef8e1af4fc8f0810e8
2022-04-28 08:03:22 +00:00
Timothée Alby
f0ac0f3e7a Merge pull request #7742 from overleaf/ta-email-preferences-page
Create Email Preferences Page

GitOrigin-RevId: 371a62e8423e5cbebff83e61bf35a8b3b638c398
2022-04-28 08:03:12 +00:00
Timothée Alby
b289afe23c Merge pull request #7725 from overleaf/ta-settings-fixes
[SettingsPage] Misc Fixes

GitOrigin-RevId: 56f58d2bb5830f7e0584a83c98efc9989ae2bd42
2022-04-26 08:04:18 +00:00
Jakob Ackermann
f1f9771150 Merge pull request #7548 from overleaf/jpa-login-instead
[web] add "Log in instead" split test and click tracking in navbar

GitOrigin-RevId: c3893540220292bdf44b30aa0c9fb2aacca2863a
2022-04-26 08:03:34 +00:00
Timothée Alby
cf2dfc6bf1 Merge pull request #7593 from overleaf/ta-settings-migration
[SettingsPage] Integration Branch

GitOrigin-RevId: 5a3c26b2a02d716c4ae3981e3f08b811ae307725
2022-04-25 08:05:12 +00:00
Alf Eaton
e096bf051a Open the correct doc on tracked change click in overview (#7622)
GitOrigin-RevId: 7bef9341c315f350c5428f8c94ce84cbc4f850c5
2022-04-25 08:04:12 +00:00
Alf Eaton
e644c2a531 Fix data on SAAS project page (#7694)
GitOrigin-RevId: ca7899b238ca2c858aa188e493b285bcf06e8298
2022-04-25 08:03:42 +00:00
Victrid
66fd18cbdc
rebase to the latest main 2022-04-16 12:06:25 +08:00
Timothée Alby
9df2e09fa2 Merge pull request #7493 from overleaf/ab-apple-meta-tags
Add meta tags for Apple mobile devices

GitOrigin-RevId: 0154e497e9844fc60e6672a7fae9e2043c9e7d81
2022-04-13 08:03:24 +00:00
ilkin-overleaf
d50271c1e9 Merge pull request #7225 from overleaf/ta-leave-modal
[DeleteAccount] Create Modal with Form

GitOrigin-RevId: 611f08c7253f59d91c6937b79c80a386b9d21ccd
2022-04-11 08:03:36 +00:00
Davinder Singh
b3d55fa65e Move admin register to user activate module
Move admin register to user activate module

Co-authored-by: John Lees-Miller <jdleesmiller@gmail.com> & Davinder Singh
GitOrigin-RevId: 79428f2932783086435bdad9b1efb5300c467511
2022-04-08 08:04:45 +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