Commit graph

6317 commits

Author SHA1 Message Date
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
487ff4f505 Improvement on form data sync between group plan modal and new plan page (#8003)
GitOrigin-RevId: 66a0a423fe48a8a8a7ddd292ba218cd5038dfdb1
2022-05-20 08:03:44 +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
Eric Mc Sween
713fe8946b Merge pull request #7966 from overleaf/em-onboarding-email-typos
Fix typos in onboarding email

GitOrigin-RevId: e46534f479ab7a7dcb753698262497893fbd7809
2022-05-18 08:05:02 +00:00
Eric Mc Sween
fd8bd62f54 Merge pull request #7933 from overleaf/em-analytics-failed-jobs-headroom
Increase the number of retained failed jobs in analytics queues

GitOrigin-RevId: 384a70b46d4eef5e07216664d6f5b94d52ca3152
2022-05-18 08:04:55 +00:00
Thomas
2d8e832be7 Subscription code decaf cleanup (#7918)
GitOrigin-RevId: 43adff9af7ca347808980823ac641db05129a79b
2022-05-18 08:04:31 +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
M Fahru
5387ec8467 Change "1 users" to "1 user" on new plans page table features (#7934)
GitOrigin-RevId: 2e4faea0907b8bfb31c294f8aa74bfee8d0b53f5
2022-05-18 08:03:34 +00:00
Jakob Ackermann
f0bd6dda23 Merge pull request #7986 from overleaf/jpa-eslint-8
[misc] upgrade eslint packages to the latest version everywhere

GitOrigin-RevId: f1480d4a171acef82fb26c4aa54be3a6088b0ab3
2022-05-17 08:05:59 +00:00
Eric Mc Sween
e0d91eaa26 Merge pull request #7906 from overleaf/em-downgrade-logs
Downgrade all INFO logs to DEBUG

GitOrigin-RevId: 05ed582ef0721fcada059f0ad158565f50feca27
2022-05-17 08:05:26 +00:00
Alf Eaton
d68180bc4e Merge pull request #7961 from overleaf/jpa-shorter-clsi-persistence
[web] lower clsi persistence duration

GitOrigin-RevId: 72929de084c5c5aac5f2382ad91a7665e96742a8
2022-05-17 08:04:25 +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
Jakob Ackermann
52073a13a9 Merge pull request #7867 from overleaf/jpa-compile-group
[web] pass compileGroup to clsi-lb

GitOrigin-RevId: c15adbff27e702b3e0f29be5b57f7a9520d8d02f
2022-05-16 08:03:36 +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
Miguel Serrano
e9e429d339 Merge pull request #7828 from overleaf/ab-subscriptiongroupcontroller-cleanup
[web] Decaf cleanup SubscriptionGroupController

GitOrigin-RevId: eb407c52e77db50481356c342fc685f30145fc23
2022-05-12 10:41:18 +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
Alexandre Bourdin
5c00fe09e4 Merge pull request #7806 from overleaf/ab-group-memberships-bigquery
[web] [analytics] Send group memberships information to analytics & import baseline data

GitOrigin-RevId: a15c3131f7b55225ae3949933578475668a195a0
2022-05-12 10:40:30 +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
6025d3571c Add support for groups when importing references from Zotero (#6204)
* Add Zotero groups support to third-party-references
* Return 400 response with { relink: true } if remote response was 403
* Handle Zotero groups in tpr-webmodule
* Handle Zotero groups in the frontend
* Handle JSON OAuth token error response from Mendeley API

GitOrigin-RevId: 8011d71a5596f7671aca16a228f9ef40be4a02d0
2022-05-12 08:04:37 +00:00
Alf Eaton
3a2de70974 Merge pull request #7783 from overleaf/jpa-clear-dropbox-notifications
[web] unconditionally clear dropbox notifications after linking again

GitOrigin-RevId: 6ca265ed1f1a060b6c5472111e98680a6bc092ff
2022-05-12 08:04:05 +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
ba3d278bd9 Fix subscription check for upgrade prompts in editor (#7799)
* Fix subscription check for upgrade prompts in editor

GitOrigin-RevId: ec6d117748e4017ae189038e56363c4a7366f2b4
2022-04-29 08:03:26 +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
Eric Mc Sween
a1ff7d8274 Merge pull request #7752 from overleaf/em-promisify-user-updater
Finish promisification of UserUpdater

GitOrigin-RevId: 8f32b2248cfd0db4232bd808f337c17bd7f7dbf4
2022-04-28 08:03:54 +00:00
Copybot
77747a0aca Merge pull request #1001 from chschenk:bug-email-create-user
GitOrigin-RevId: f0c0c8dbfddc78a35bf421ea31b9ed4631312c68
2022-04-28 08:03:27 +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
f771119cb1 Merge pull request #7712 from overleaf/jpa-email-copy-changes
[web] make copy changes to trial onboarding email

GitOrigin-RevId: 027ba8d471c0cac56dff7c56135d091a96817cf3
2022-04-26 08:04:31 +00:00
Timothée Alby
62075a6ba9 Merge pull request #7735 from overleaf/jpa-fix-hard-deletion
[web] fix result handling from project-archiver hard deletion

GitOrigin-RevId: c6d7746e5e45b05d6372e5efcc029e0b566ace2d
2022-04-26 08:04:25 +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
Christopher Schenk
0030995dd2 Call callback function after sending mail
Call callback function after successfully or unsuccessfully
sending the activation mail.
Fixes #988
2022-04-25 13:31:42 +02: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
Tim Down
35480a3c7d Merge pull request #7545 from overleaf/td-split-test-data-sentry
Record split-test state in Sentry metadata from web clients

GitOrigin-RevId: 66dd195c546bd9fb0aedac52844200846c5012ca
2022-04-25 08:04:45 +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