Commit graph

345 commits

Author SHA1 Message Date
Miguel Serrano
f39a650823 Merge pull request #2749 from overleaf/ew-ta-google-2fa-error
fix ERR_HTTP_HEADERS_SENT error with oauth and 2fa

GitOrigin-RevId: b70bd79fb544121337be27349a967d52da115930
2020-04-23 03:29:21 +00:00
Miguel Serrano
ac1a7c4c52 Merge pull request #2752 from overleaf/ta-notifications-mark-as-read-fix
Fix `markAsRead` Calls

GitOrigin-RevId: 89609251a082adb825522141864cd3f44315ae45
2020-04-23 03:29:11 +00:00
Eric Mc Sween
d063ab2bc5 Merge pull request #2745 from overleaf/em-promisify-project-upload-manager
Finish promisification of ProjectUploadManager

GitOrigin-RevId: a8550d9decf25af35a2d2f82770cff336a4153cc
2020-04-17 03:23:30 +00:00
Brian Gough
9639fbf232 Merge pull request #2737 from overleaf/bg-split-editor-events-metric
split metric for editor events by message type

GitOrigin-RevId: 832b0abf8582138c05b786dcf9114dcdb3a63b91
2020-04-15 03:15:07 +00:00
Jakob Ackermann
825d0701e8 Merge pull request #2742 from overleaf/jpa-hotfix-user-lookup
[UserPagesController] block arbitrary user lookups

GitOrigin-RevId: 4d88abbd0ad14289a73e7f502c0686f206617459
2020-04-14 03:19:24 +00:00
Simon Detheridge
0586f4d682 Merge pull request #2714 from overleaf/cmg-jpa-call-stack-exceeded
Stop call stack from being exceeding when adding many files

GitOrigin-RevId: 1983b0c16cb279c6f173f614d541d16852664e24
2020-04-09 03:21:38 +00:00
Simon Detheridge
117cd59b40 Merge pull request #2728 from overleaf/jpa-ns-handle-422-when-adding-email
Improve error messaging if user adds affiliation that doesnt match domain matcher

GitOrigin-RevId: 12c21c611c6a826ee7e41cc87613913aa58ac13e
2020-04-09 03:21:21 +00:00
Shane Kilkelly
7ec7237f17 Merge pull request #2716 from overleaf/em-promisify
Promisify FileSystemImportManager

GitOrigin-RevId: 8f89492872c94a596afbfa644e5f2b985eb65a28
2020-04-09 03:21:09 +00:00
Shane Kilkelly
cc34a1b867 Merge pull request #2715 from overleaf/ta-remove-log
Remove Useless and Broken Logging

GitOrigin-RevId: 9583d7c37df287115da62f7b5090340ce8a01208
2020-04-09 03:20:57 +00:00
Shane Kilkelly
d6bd911a6e Merge pull request #2720 from overleaf/sk-remove-nodemailer-sendgrid
Remove nodemailer sendgrid

GitOrigin-RevId: af84dd78291957371d679de43bc4570960a7b635
2020-04-09 03:20:45 +00:00
Jakob Ackermann
155b22caf9 Merge pull request #2713 from overleaf/jpa-custom-wsurl-for-beta-users
[misc] custom wsUrl for beta users

GitOrigin-RevId: e731ae7245e9c5586ae82cbc4c6716a74e56f2c9
2020-04-03 03:20:47 +00:00
Ersun Warncke
50d715ea5d set entitlement to false on reg if none
GitOrigin-RevId: 039189699f78cbaa5917cfadb7d3bedd599c6396
2020-04-02 03:19:57 +00:00
Jessica Lawshe
4a1ac4649c Change "email" to "email address" in error message
GitOrigin-RevId: a9b4720a006aedabacd37ee9fc9bc16f0b948b3c
2020-04-02 03:19:53 +00:00
Timothée Alby
35ef98781f Merge pull request #2692 from overleaf/ta-authorization-helper
Add Authorizationhelper

GitOrigin-RevId: 35fa8d8fc005c9eb171621c872010e6c831ba8f6
2020-04-02 03:19:40 +00:00
Timothée Alby
1d7b454c96 Merge pull request #2691 from overleaf/ta-4xx-error-page
Enhance 4xx HTML Response Page

GitOrigin-RevId: 620f84cd6cdc0571bd68bbd2c3164b08f7fe5598
2020-04-02 03:19:35 +00:00
Timothée Alby
fb2e182d2e Merge pull request #2690 from overleaf/ta-redirection-helper
Add RedirectionHelper

GitOrigin-RevId: 229ca78f26a9db205e23ecf91f85d6d1e926750a
2020-04-02 03:19:31 +00:00
Timothée Alby
05a2529881 Merge pull request #2689 from overleaf/ta-pre-finish-login-hook
Add preFinishLogin Hook

GitOrigin-RevId: 8379e0643866feef95c648a2db4d8665420e615b
2020-04-02 03:19:27 +00:00
nate stemen
797d76f90e Merge pull request #2705 from overleaf/jpa-pub-sub-metrics
[misc] track redis pub/sub payload sizes on publish

GitOrigin-RevId: 7ef7ada34f9f6376abdd2b0b6aa10a5aac56a62f
2020-03-31 03:18:59 +00:00
nate stemen
344b2b2395 Merge pull request #2702 from overleaf/ta-subscription-links
Fix Language Change Links

GitOrigin-RevId: e47f59dfd53102d4569c3ffeb950d3259c65215b
2020-03-31 03:18:45 +00:00
Eric Mc Sween
5cf06bbb4d Merge pull request #2696 from overleaf/ns-default-font-family-line-height
Set default options for font family and line height

GitOrigin-RevId: 7c5a29134e75e3545e508021c305fa6d6e0d04c1
2020-03-25 04:16:58 +00:00
Shane Kilkelly
b51e3c01e4 Merge pull request #2614 from overleaf/sk-monolithify-tags
Move 'tags' into web

GitOrigin-RevId: a248d1b2471f0bfa05589df9b7357b4d85793a79
2020-03-25 04:16:44 +00:00
nate stemen
bffb9f3bce Merge pull request #2678 from overleaf/jel-unreliable-sso-email
Use SSO email attribute flag from API instead of settings file

GitOrigin-RevId: 088b4247a0cbd56ff2184ac6d280e427cea3972e
2020-03-19 04:17:22 +00:00
nate stemen
31b95e8617 Merge pull request #2603 from overleaf/jpa-ns-cmg-binary-upload
[ProjectEntityUpdateHandler] handle entity changes on upsert

GitOrigin-RevId: 134e2c8909db5a336bce62460e46b3e625463c6f
2020-03-19 04:17:18 +00:00
Eric Mc Sween
9f3b2d2cdc Merge pull request #2670 from overleaf/em-convert-doc-to-file-rev
Adjust the file rev when converting a doc to a file

GitOrigin-RevId: 6765bcac1fcd4f4db35f9ce88af1f201f5da509a
2020-03-17 04:18:15 +00:00
Eric Mc Sween
44cb795050 Merge pull request #2672 from overleaf/jpa-import-670
[misc] ProjectUploadController: use camelCase for log context fields

GitOrigin-RevId: f834fe1546dd8e94830251b5cd63f8407cd6a482
2020-03-17 04:18:11 +00:00
Ersun Warncke
c0049d8b67 patch xml-crypto to fix carriage return normalization (#2671)
* patch xml-crypto to fix carriage return normalization

Co-authored-by: Ersun Warncke <ersun.warncke@overleaf.com>
GitOrigin-RevId: 65c79216b1f8602dd4b31596578d319e47904e2b
2020-03-13 04:19:58 +00:00
Jessica Lawshe
30763043d1 Merge pull request #2663 from overleaf/jel-sso-missing-email-error
Institution SSO error handling when missing session data

GitOrigin-RevId: c455ef97eb17b98ffbd03eb5f623ceb27678deed
2020-03-12 04:18:52 +00:00
Jessica Lawshe
a433235310 Merge pull request #2643 from overleaf/jel-affiliations-cron-job
Ensure affiliations cron job

GitOrigin-RevId: 4ac6f8b29b1e1460d627a86172fcdf1fa27a59a8
2020-03-12 04:18:47 +00:00
Brian Gough
fc028c7544 Merge pull request #2633 from overleaf/bg-fix-health-check-for-web-api
fix the health check on the api router

GitOrigin-RevId: 985322f8e4ff0b5dddbe7cf68c41414af6fd502d
2020-03-11 04:14:58 +00:00
Eric Mc Sween
8547bb3c8d Merge pull request #2661 from overleaf/em-convert-doc-to-file-ranges
Do not convert a doc to file when it has ranges

GitOrigin-RevId: 52f0151e54c426178f80c34c6afac908bbf7b90d
2020-03-11 04:14:54 +00:00
Eric Mc Sween
58017d4480 Merge pull request #2659 from overleaf/em-binary-file-history-fix
Fix binary file diffs

GitOrigin-RevId: 1773e8918a0f82a1945470630ca691dfa4b13026
2020-03-06 04:13:46 +00:00
nate stemen
6379f15815 Merge pull request #2651 from overleaf/ta-missing-return
Add Missing Return

GitOrigin-RevId: aeb622a6745678eb687217beeb49b5d023168052
2020-03-06 04:13:42 +00:00
Eric Mc Sween
fbc1136be7 Merge pull request #2649 from overleaf/em-delete-project-history
Delete project in project history when expiring

GitOrigin-RevId: a6bf44a88de35e777b135d8f84d68e3b0ba8908f
2020-03-05 04:17:00 +00:00
Eric Mc Sween
2627595040 Merge pull request #2639 from overleaf/em-convert-doc-to-file
Endpoint for converting a doc to a file

GitOrigin-RevId: 0a3bd46a7a78537b0f64dc577402277cbe81fecb
2020-03-05 04:16:49 +00:00
Hugh O'Brien
693100358c Merge pull request #2646 from overleaf/as-fix-trashing-old-archived-project
Fix error thrown when trashing project with legacy boolean archived state

GitOrigin-RevId: 0131a2294767e00d69c4dd80ed86dfd5d77339b8
2020-03-04 04:21:54 +00:00
Hugh O'Brien
bb958492a9 Merge pull request #2623 from overleaf/hb-third-party-too-many-files
Third party too many files errors

GitOrigin-RevId: 0a44931b14dd349d9cc4d25a3b51c68f221b8195
2020-03-04 04:21:43 +00:00
Eric Mc Sween
d8d1bdd461 Merge pull request #2647 from overleaf/em-promisify-history-manager
Promisify HistoryManager

GitOrigin-RevId: cbf946a7d61f7f57bad03e4c83184c6decd91027
2020-03-04 04:21:26 +00:00
Eric Mc Sween
b2ee3bf2bb Merge pull request #2634 from overleaf/jel-ensure-affiliations
Ensure affiliations after loading the settings page

GitOrigin-RevId: bf9982fb436d0e75d6fbd8418ca2d19e00fe3b66
2020-03-03 04:21:44 +00:00
Eric Mc Sween
864394d4ad Merge pull request #2640 from overleaf/em-promisify-project-deleter
Finish promisification of ProjectDeleter

GitOrigin-RevId: a426117c9430e2ee66b297b95f67460062a6a809
2020-03-03 04:21:39 +00:00
Timothée Alby
e7f968d370 Merge pull request #2637 from overleaf/jpa-hotfix-graceful-session-access
[ErrorController] handleError: access session gracefully

GitOrigin-RevId: 90c8ce0be80f5f198139a3b079c3a81e200112db
2020-02-29 04:17:36 +00:00
Timothée Alby
42aa999af6 Merge pull request #2638 from overleaf/ta-subscription-change-admin-fix
Change Manager When Changing Admin of Individual Subscriptions

GitOrigin-RevId: 3da53789f4331c4eb8d0a458650ea41f8b2b4f97
2020-02-29 04:17:31 +00:00
Eric Mc Sween
4e760e276a Merge pull request #2622 from overleaf/em-promisify-editor-http-controller
Promisify EditorHttpController

GitOrigin-RevId: 938350f21a19c10c6bd4261086265a098e71e932
2020-02-28 04:18:42 +00:00
Eric Mc Sween
77c75bf223 Merge pull request #2597 from overleaf/as-cleanup-tags-handler
Clean up tags handler

GitOrigin-RevId: 6e83880d9a38b323470933f6ef01fde187d55161
2020-02-28 04:18:25 +00:00
Eric Mc Sween
1da929fcdb Merge pull request #2618 from overleaf/ew-clear-root-doc-on-delete
Clear root doc on delete

GitOrigin-RevId: 4121d198f5253417bca2284c5f750c088debcb8c
2020-02-28 04:18:17 +00:00
Eric Mc Sween
174af14d46 Merge pull request #2610 from overleaf/ta-recurly-email-update-auto
Update Recurly Email on Default Email Change

GitOrigin-RevId: e2821d7bdc4bc6befff2152d92c76952c38694f9
2020-02-28 04:18:09 +00:00
Brian Gough
509c23def7 Merge pull request #2631 from overleaf/bg-maintenance-messages-in-editor
display maintenance messages in editor

GitOrigin-RevId: 7d4fda60c5e2bd12d2cead2a9bff326b75e9c4e7
2020-02-27 04:17:59 +00:00
Shane Kilkelly
2686f5e72a Merge pull request #2630 from overleaf/sk-fix-token-login-redirect
Remember token page when redirect to login

GitOrigin-RevId: 1c4d7b8ae034ef2d63cc680405c099405024f4d1
2020-02-26 04:24:06 +00:00
Shane Kilkelly
7cbb00f207 Merge branch 'sk-token-csrf-protection'
GitOrigin-RevId: e71f7264be45b665502150e9ffbb85b3fc94665e
2020-02-26 04:24:01 +00:00
Timothée Alby
995dbc514d Merge pull request #2594 from overleaf/jel-flag-affiliation-when-registering
Flag unchecked affiliation when registering

GitOrigin-RevId: c9da12ceb5a1712c8c477222f967fb54eceef252
2020-02-21 04:21:16 +00:00
Timothée Alby
f5e2983a6b Merge pull request #2609 from overleaf/ta-cmg-recurly-email-update
Add UI to Update Recurly Email

GitOrigin-RevId: 920a741fd9b4312f031bdd40e3d6bec48f1bd579
2020-02-21 04:21:12 +00:00