Commit graph

1065 commits

Author SHA1 Message Date
Thomas
895f52d41a Let users upgrade to group plans via subscription dashboard (#5100)
* Let users upgrade to group plans via subscription dashboard

Users on an individual plan don't have a way to upgrade to a group
subscription without contacting support. As a temporary measure, we're
adding a way to do this by re-using the existing group plan modal from
the plans pages, to allow users to configure and upgrade to a group plan
directly.

This is currently only available for USD, EUR, and GBP - since although
we now support other currencies in Recurly, the group plans modal does
not yet support them. The user however can not change currency here,
their group subscription will be in the same currency as their current
individual subscription.

The group plan modal has been duplicated rather than extended, to keep
this code seperate as it is potentially only a stopgap measure - and we
don't want to be untangling the additional logic from the existing
modal/template later down the line.

GitOrigin-RevId: 10664bd19af2c3870dfe7e19fd0f9c5b7c877cc6
2021-09-15 08:04:00 +00:00
Hugh O'Brien
f7900b474b Merge pull request #4799 from overleaf/hb-eslint-rules
Re-enable some eslint rules

GitOrigin-RevId: 16153adb839bb61784bb40fbc8e43da281fe090d
2021-09-15 08:03:43 +00:00
Eric Mc Sween
a10c042e20 Merge pull request #4947 from overleaf/em-project-rename-for-owners-only
Prevent collaborators from renaming a project

GitOrigin-RevId: 94d12e25592fea55b84427aeae78f7bb2a544a58
2021-09-14 08:03:38 +00:00
Alexandre Bourdin
3577f25ba2 Merge pull request #5051 from overleaf/ab-web-mono-analytics-id
Analytics ID Support (v2)

GitOrigin-RevId: 707f62697f6566d8aad22e424684d97f7bc147df
2021-09-13 08:03:14 +00:00
Alexandre Bourdin
5b8de28250 Merge pull request #5050 from overleaf/revert-4639-ab-web-mono-analytics-id
Revert "Analytics ID support"

GitOrigin-RevId: cc5da762ba1bafcbcea65ed0dd86342896b6d1eb
2021-09-10 08:04:47 +00:00
Alexandre Bourdin
6dd641e0e6 Merge pull request #4639 from overleaf/ab-web-mono-analytics-id
Analytics ID support

GitOrigin-RevId: 820a6c0f4d19f046f6c791ce4dc64dbc80748924
2021-09-10 08:04:31 +00:00
Alexandre Bourdin
1094b0570b Merge pull request #4922 from overleaf/jpa-web-clsi-metrics
[web] add new metrics for tracking initial assign/switch of clsi backend

GitOrigin-RevId: 4fb15ee8727cb397d1e44a86efb7d4833626bc6b
2021-09-01 08:03:11 +00:00
Jakob Ackermann
006a140fb8 Merge pull request #4645 from overleaf/jpa-pdf-caching-opt-in
[misc] make PDF caching an opt-in feature

GitOrigin-RevId: 85ea5739d7bbeea3ac2517ec99f90f2beec2a768
2021-08-25 08:03:44 +00:00
June Kelly
8aeb782791 Merge pull request #4672 from overleaf/sk-validate-currency-param
Subscription: validate currency in query param
GitOrigin-RevId: 0c9f841ba56b5ce85bbd2adeb3fb2d45d0ad753a
2021-08-25 08:03:20 +00:00
Brian Gough
1da0edbcaf Merge pull request #4801 from overleaf/ae-resync-editable-file
Use a file hash to decide if a file is editable when resyncing

GitOrigin-RevId: 57d78b3d73bf2595070a7c7eb7ec97eeece3a163
2021-08-24 08:03:28 +00:00
Jessica Lawshe
c14437d2dd Merge pull request #4795 from overleaf/jel-project-title-regex
Escape project title for regular expression

GitOrigin-RevId: 495b96720de6d09cda905edc6464b55a5c85e21d
2021-08-24 08:03:19 +00:00
Jakob Ackermann
b8f2cc1b91 Merge pull request #4841 from overleaf/jpa-ho-clsi-user-project-persistence-take-2
[web] partition clsi persistence by project and user

GitOrigin-RevId: d42dca11dfbe329974c26d3b31eb9fcba359b785
2021-08-23 11:22:39 +00:00
Jakob Ackermann
8bbf6fb52c Merge pull request #4840 from overleaf/revert-4736-ho-clsi-user-id-mapping-minimal
Revert "Clsi user id mapping (mono repo)"

GitOrigin-RevId: 046bf21f1ab90f375d3945d8baa22600d8cdbf2b
2021-08-23 08:03:00 +00:00
Henry Oswald
2b7c7e84ef Clsi user id mapping (#4736)
* add user-id into clsi project mapping

* add user_id on backend group clsi key

GitOrigin-RevId: ebbf025f5cd88848b44f35a46045d112ea6b4c3b
2021-08-23 08:02:45 +00:00
Alexandre Bourdin
7e6839b0af Merge pull request #4715 from overleaf/ab-project-members-modal-split-test
Share modal split test

GitOrigin-RevId: 274450564e1cbfc3ba3ec7c2ca60dfeda552a536
2021-08-20 08:04:05 +00:00
Eric Mc Sween
9f4541c266 Merge pull request #4761 from overleaf/em-peek-doc
Do not unarchive docs when resyncing project history

GitOrigin-RevId: c7df75789c01e6c85b464a9b94b14654d8568407
2021-08-20 08:03:50 +00:00
Eric Mc Sween
84559790f2 Merge pull request #4690 from overleaf/tm-upgraded-history-allow-downgrade
Projects migrated to full project history should send history to both systems if allowDowngrade is set

GitOrigin-RevId: 52c46345eb8606e363ae85727d29e87f35cea37d
2021-08-19 08:02:53 +00:00
Eric Mc Sween
0654805cbb Merge pull request #4760 from overleaf/em-explicitly-start-queue-workers
Start queue workers explicitly

GitOrigin-RevId: 0f8b710e0f1c0d64efa04f46fec269fae53609b2
2021-08-18 08:02:56 +00:00
Jessica Lawshe
379d9ac41c Merge pull request #4659 from overleaf/jel-em-duplicate-subscription-message
One Pro message per current commons institutions

GitOrigin-RevId: 21b74af8b9da1b6647a0384115f5d268b80e4bdf
2021-08-17 08:03:44 +00:00
Jessica Lawshe
c0b27c4524 Merge pull request #4719 from overleaf/jel-user-features-refresh
Fix featuresChanged flag

GitOrigin-RevId: 1290f9b2b43cae2f1c4912df649800453ca20344
2021-08-17 08:03:32 +00:00
Thomas
77bcd4c39e Revert "Initialise full project history for old projects when project opened (#4687)" (#4740)
This reverts commit ac263dca8cf0d80186fee916a76e5572ec5649d4.

GitOrigin-RevId: cc82e9c7d51966a7be0e8bef06ae4afe3f73170c
2021-08-13 12:59:04 +00:00
Thomas
7517a818b2 Initialise full project history for old projects when project opened (#4687)
* Initialise full project history for old projects when project opened

This begins a second attempt at initialising the full project history in
the background for projects without a full project history id.

The original web-internal#4345 was reverted in web-internal#4353. This
commit reverts the revert, and adds an additional flush of the project
before initialising full project history.

GitOrigin-RevId: ac263dca8cf0d80186fee916a76e5572ec5649d4
2021-08-13 12:58:56 +00:00
June Kelly
8b9d202518 Merge pull request #4655 from overleaf/jel-gallery-event
Fix onclick event propagation

GitOrigin-RevId: bfcc3840e1768ed0f91e5fefbaee1738e36f6752
2021-08-13 12:57:55 +00:00
Alexandre Bourdin
3d963027eb Merge pull request #4340 from overleaf/jpa-ta-hide-unavailable-new-file-options
[frontend] hide new file from project UX when feature are disabled

GitOrigin-RevId: 8407453267dded1f97d19cede5a13691610b97e7
2021-07-30 13:08:08 +00:00
Thomas
a84cf5f53b Revert "Initialise full project history for old projects (in background) when project opened (#4345)" (#4353)
This reverts commit 2da493c6023b362ced197b0533fa684c654a3827.

GitOrigin-RevId: b11dfff5cce1070c6b8113dc0988fae9ade0d39b
2021-07-29 02:05:23 +00:00
Thomas
812b4b549f Initialise full project history for old projects (in background) when project opened (#4345)
Co-authored-by: Brian Gough <brian.gough@overleaf.com>
GitOrigin-RevId: 2da493c6023b362ced197b0533fa684c654a3827
2021-07-28 12:36:31 +00:00
Alexandre Bourdin
9468e5cb4f Merge pull request #4338 from overleaf/ab-session-manager
Extract functions from AuthenticationController to SessionManager

GitOrigin-RevId: 86870ce03a762e1a837dcf493759e8851e759883
2021-07-28 12:36:22 +00:00
Jessica Lawshe
944ec4e47b Merge pull request #4320 from overleaf/hb-handle-invalid-filenames-upload
Handle invalid filenames in upload modal

GitOrigin-RevId: f3438d8653cf29ef9536a71692c03b5802d90a6d
2021-07-28 02:07:07 +00:00
Jessica Lawshe
9df283caef Merge pull request #4334 from overleaf/jel-check-institution-users
Change check_institution_users.js output

GitOrigin-RevId: c331d5312dc807fd5118f4ce78737bde04a82c66
2021-07-28 02:07:03 +00:00
Jessica Lawshe
c6786cadc0 Merge pull request #4316 from overleaf/jel-user-confirmed-institutions
Exclude lapsed reconfirmations from confirmed affiliations

GitOrigin-RevId: 5987299ead2717abd54e313693f1cfc141915f8d
2021-07-28 02:06:58 +00:00
Shane Kilkelly
10deaf5aec Merge pull request #4332 from overleaf/sk-import-server-pro-acceptance-tests
Migrate server-pro acceptance tests to modules

GitOrigin-RevId: 7caf5719d21bbd7fb30901f3e52225fe4cbc9832
2021-07-28 02:06:46 +00:00
Jakob Ackermann
63fb7a022a Merge pull request #4342 from overleaf/jpa-fix-clsi-server-id-handling
[misc] get current clsi server id directly from compile response

GitOrigin-RevId: 403e7ca35270a8937a0066fe2c8daf52ed71531d
2021-07-28 02:06:29 +00:00
Jakob Ackermann
9d00c351a8 Merge pull request #4327 from overleaf/jpa-pw-reset-captcha
[misc] add captcha on password reset requests

GitOrigin-RevId: 9a23b9c9dee2c56345e9c1846861c05c25126802
2021-07-28 02:06:02 +00:00
Jakob Ackermann
fe4c48b7fb Merge pull request #4325 from overleaf/jpa-core-tests-in-saas-ce-pro
[misc] run core tests in SAAS/Server CE/Server Pro environment

GitOrigin-RevId: 6278ae1eb760a4c0c16da1b71efdde844764a526
2021-07-20 11:33:46 +00:00
Eric Mc Sween
ac90b29928 Merge pull request #4289 from overleaf/em-sk-rename-sanitize
Do not HTML escape the file name when renaming a file

GitOrigin-RevId: 9b6441e2f53bc34086de9c6a19fa526b833a9134
2021-07-14 12:40:20 +00:00
Jakob Ackermann
fa39ef7fe5 Merge pull request #4296 from overleaf/jpa-cleanup-config
[config] minor cleanup

GitOrigin-RevId: 72f39e88cb91c7ed7305ade6dc46f63d7bf43ce9
2021-07-08 02:08:34 +00:00
Jakob Ackermann
5e773ce950 Merge pull request #4101 from overleaf/ae-settings-module
Migrate from `settings-sharelatex` to `@overleaf/settings`

GitOrigin-RevId: 9a298ba26382180c1351683c5fddc9004418c1e6
2021-07-08 02:08:28 +00:00
Paulo Jorge Reis
966013f58a Revert "Revert "Extend the new compile UI rollout, respecting existing allocations""
This reverts commit d0ffcb9a13e9597cebf95961c0c50ef8f950dd7a.

GitOrigin-RevId: 46c52ee8df8de4028b3262cb0f3202118014814c
2021-07-07 02:05:44 +00:00
Alexandre Bourdin
40c7f2dae1 Merge pull request #4219 from overleaf/ab-group-subscription-user-property
Send group subscription user property

GitOrigin-RevId: d1033ab4e0b5061b9d4a781e319d6b690f7e6154
2021-07-06 02:05:54 +00:00
Eric Mc Sween
9820b787a7 Merge pull request #4254 from overleaf/em-active-projects-expire
Unit test for not expiring active projects

GitOrigin-RevId: 8b2f3d05c7f7e4c4d44e5487041f19d2bff9891a
2021-07-03 02:09:12 +00:00
Miguel Serrano
7430d7f558 Merge pull request #4287 from overleaf/jpa-no-analytics-queues-server-ce-pro
[misc] do not set up analytics queues in Server CE/Pro

GitOrigin-RevId: 61a62f0ff7f04d5206845e01c68097229a5954fd
2021-07-01 12:30:26 +00:00
Jakob Ackermann
103873a013 Merge pull request #4275 from overleaf/jpa-drop-slow-compile-request-bailout
[misc] drop slow compile request bailout

GitOrigin-RevId: b5eec86878fbc7220dfe163241f29a3f5851c19f
2021-06-29 02:06:04 +00:00
Paulo Jorge Reis
1e43dd3495 Revert "Extend the new compile UI rollout, respecting existing allocations"
This reverts commit 61bfba3a05780ec0b3a3461bba50cca6474a1274.

GitOrigin-RevId: d0ffcb9a13e9597cebf95961c0c50ef8f950dd7a
2021-06-29 02:05:49 +00:00
Jakob Ackermann
15978e1510 Merge pull request #4262 from overleaf/jpa-bump-sync-overhead
[ClsiManager] bump sync overhead from 60s to 120s

GitOrigin-RevId: ce968a054419a3ad8e6b0bd0ff5897aae3643f8c
2021-06-25 02:06:32 +00:00
Jakob Ackermann
e57be19ee3 Merge pull request #4261 from overleaf/jpa-fake-timed-out-response
[ClsiManager] respond w/ status=timedout for timed out compile requests

GitOrigin-RevId: 2937355bfd8d58870509ab40c2ba19f014f82a37
2021-06-25 02:06:28 +00:00
Paulo Reis
d6f9f70d06 Extend the new compile UI rollout, respecting existing allocations
GitOrigin-RevId: 61bfba3a05780ec0b3a3461bba50cca6474a1274
2021-06-25 02:06:24 +00:00
Shane Kilkelly
9dc44de7f0 Merge pull request #4191 from overleaf/sk-token-v1-fix
TokenAccess: Fix handling of deleted projects
GitOrigin-RevId: a602da335567d36b5e674ada69c1e1ab4a909d4a
2021-06-25 02:05:48 +00:00
Eric Mc Sween
8462a3e1f5 Merge pull request #4252 from overleaf/em-active-projects-expire
Prevent active projects from expiring

GitOrigin-RevId: b815ef2022470cc1ec4dc47fb1b13563b230814f
2021-06-24 02:07:24 +00:00
Thomas
be73463e35 Merge pull request #4248 from overleaf/tm-ta-new-subscription-currency-fixes
Fix getCurrencyCode behavior and add fallback in frontend for invalid currencies

GitOrigin-RevId: 5cc40b524148f88c0f110d2cf4bb4d3b69844f1b
2021-06-24 02:07:14 +00:00
John Lees-Miller
a1f66a5252 Fix ObjectId/String comparison in ensureRootDocumentIsValid (#4229)
GitOrigin-RevId: 8af2a74cd24cb5bfdfdcd1a25c16b94a66fa0843
2021-06-24 02:07:10 +00:00