Commit graph

5439 commits

Author SHA1 Message Date
Timothée Alby
345adb8ad2 Merge pull request #2862 from overleaf/spd-flaky-oio-test
Fix flaky Open-in-Overleaf tests

GitOrigin-RevId: 7badb0e88b5c01478406e0cea3564d46e1b7a881
2020-05-26 03:11:18 +00:00
Simon Detheridge
01c3e6e768 Merge pull request #2851 from overleaf/spd-oio-largefile-dos
Limit size when downloading files in Open-in-Overleaf

GitOrigin-RevId: 0d35c91bcfbc6ebd846f8e61f58bafa45892a280
2020-05-23 03:18:32 +00:00
Simon Detheridge
ca916f0cac Merge pull request #2844 from overleaf/ta-admin-affiliations
Improve Admin Affiliations UI

GitOrigin-RevId: 1e3bcb425e1cb8463b2c3c7bbc757ab444b391a3
2020-05-23 03:18:25 +00:00
Simon Detheridge
4c88a83332 Merge pull request #2819 from overleaf/jpa-sk-improve-pug-precompile
[misc] improve pug precompile

GitOrigin-RevId: 2eaa9be3f04c2639ca3b2fce4b36f42972622124
2020-05-23 03:18:13 +00:00
nate stemen
8ba78bd559 Merge pull request #2848 from overleaf/ns-account-deletion-v1-references
remove references to v1 projects on account deletion

GitOrigin-RevId: 1e886d6b693f98ee81efc704d2a3688de43981ef
2020-05-22 03:24:48 +00:00
Eric Mc Sween
a45df5e3af Merge pull request #2853 from overleaf/em-fix-formatting
Fix formatting

GitOrigin-RevId: ff42230a9d4c21093b3ae59c6c78021c1f453e61
2020-05-21 03:22:57 +00:00
Eric Mc Sween
00bdc52fab Merge pull request #2840 from overleaf/jel-sso-redundant-subscription-notification
Redundant subscription notification if entitlement via SSO

GitOrigin-RevId: 8529204e78c3a43d87acbb375fea15c62cad48a3
2020-05-21 03:22:51 +00:00
Eric Mc Sween
63c155b1e8 Merge pull request #2831 from overleaf/ew-delete-unused-templates
Delete unused external pages

GitOrigin-RevId: 02d179b613815f3aad3e189a4f57db8e42bdf2a3
2020-05-21 03:22:40 +00:00
Eric Mc Sween
935fdb2b5e Merge pull request #2837 from overleaf/msm-set-native-promise-mongoose
Set Mongoose to explicitly use native promises

GitOrigin-RevId: 551dfbbc51233bace25699fd8d92610c69809c86
2020-05-21 03:22:35 +00:00
Eric Mc Sween
ae63093300 Merge pull request #2799 from overleaf/ho-rate-limit-additions
add rate limiting to /status/compiler/:Project_id

GitOrigin-RevId: 5237121cc281207b261246b742bd7b52c844434d
2020-05-21 03:22:30 +00:00
Eric Mc Sween
69e1aba86f Merge pull request #2836 from overleaf/em-as-ns-fix-ng-repeat
Fix ng-repeat error when uploading two files with the same name

GitOrigin-RevId: 6de85f54c1f497dfb980f4ed4c41efc2d9942277
2020-05-21 03:22:24 +00:00
Eric Mc Sween
3d411b98cf Merge pull request #2838 from overleaf/msm-fix-npm-warnings
Fix npm warnings

GitOrigin-RevId: afc57deb7c4d07d7e86c9c9964fe76ace7b46901
2020-05-21 03:22:19 +00:00
Eric Mc Sween
8ba63b0f8e Merge pull request #2849 from overleaf/em-convert-file-to-doc
Fix update order when converting a file to a doc

GitOrigin-RevId: a0c9488e3870cc972c21b40ff0e2577fcec40ee0
2020-05-21 03:22:07 +00:00
nate stemen
f5b2640c82 Merge pull request #2817 from overleaf/ns-project-import-deletion-v1-handler
remove checks if project is in importing state

GitOrigin-RevId: f087cf04436b38b351b6985cecc9182256401cba
2020-05-21 03:22:02 +00:00
nate stemen
2479cb485a Merge pull request #2826 from overleaf/ns-project-import-flow-deletion
Project import flow deletion

GitOrigin-RevId: 08ffc156eb158235d4ccacba2b3ed504cd9978f0
2020-05-21 03:21:56 +00:00
nate stemen
5fca56d4e6 Merge pull request #2807 from overleaf/ns-project-import-deletion-dashboard
Clean up references to v1 projects on project dashboard

GitOrigin-RevId: e574382fb1747da7a701808148434f4d689cbe33
2020-05-20 03:21:44 +00:00
Hugh O'Brien
87c83b96db rotate chat arrow to top
GitOrigin-RevId: 755e7de8b9b2c11614faec79baac61618fd30006
2020-05-19 03:20:20 +00:00
Hugh O'Brien
b5814f0a3a remove gravatars
GitOrigin-RevId: e90bddcc560160cdf7397acc311f7f31f9861f81
2020-05-19 03:20:09 +00:00
Paulo Reis
d536ea8a24 Remove "Pay by invoice or VAT invoice" option from group account modal
GitOrigin-RevId: bbcadc98c71a14a97e5c31c3877e83bb8f8bfce2
2020-05-19 03:20:04 +00:00
Ersun Warncke
13441d1590 remove try/catch on multer that was added for old build env
GitOrigin-RevId: 99368ebec231dea2580c45b0da43b459fdbd8936
2020-05-19 03:19:52 +00:00
Chrystal Maria Griffiths
b430ad5e26 Merge pull request #2835 from overleaf/cmg-increase-group-invites
Increase number of group invites that can be processed at once

GitOrigin-RevId: 59644a5260c41ddaff49125d265fb88dce57eaa3
2020-05-19 03:19:47 +00:00
Eric Mc Sween
ae82366122 Merge pull request #2827 from overleaf/em-faster-clones
Make a single Mongo update when cloning projects

GitOrigin-RevId: abd4069bd8854d84c413bc8f890583e647b7c18e
2020-05-14 03:26:15 +00:00
Alasdair Smith
0e9e57cd7c Merge pull request #2812 from overleaf/as-upgrade-ace-1.4.10
Upgrade to Ace v1.4.10

GitOrigin-RevId: 1e70b37fd93593d881ae317faa2e2ec146362db2
2020-05-14 03:26:07 +00:00
Jessica Lawshe
295264697e Merge pull request #2815 from overleaf/jpa-cmg-project-clone-set-owner
Fix cloning a project putting a question mark next to it

GitOrigin-RevId: beb01e3c4496912beb0478017f14ed889a9a09de
2020-05-13 03:23:23 +00:00
nate stemen
186adf8410 Merge pull request #2816 from overleaf/jpa-fix-project-list-for-ce
[misc] fix project list for installations w/o affiliations feature

GitOrigin-RevId: 2fa2cf7ac5418e04ab876c7fffcd9614fe7af0b3
2020-05-12 03:26:00 +00:00
Jessica Lawshe
4349e85444 Merge pull request #2813 from overleaf/ns-ta-group-account-admin
Add admin to group account when new group account is created

GitOrigin-RevId: 81c49a0b414896153a85a8ba1afc364164047c1c
2020-05-07 03:28:28 +00:00
Jessica Lawshe
43a88a0939 Merge pull request #2806 from overleaf/jel-add-space-change-plan
Add a space before "Change plan"

GitOrigin-RevId: 99e39a65c251d5a09964891b3355b919b06df877
2020-05-07 03:28:23 +00:00
Jessica Lawshe
b0b7e56770 Merge pull request #2803 from overleaf/jel-og-video
Include og:video in metadata

GitOrigin-RevId: ce49aad16eb29d22447f3206b7a1dc6accdf2933
2020-05-07 03:28:17 +00:00
Miguel Serrano
7658a515ba Merge pull request #2790 from overleaf/ta-sso-notifications-no-dismiss
Don't Display Dismiss Button on SSO Notifications

GitOrigin-RevId: f578f57ac348fba4375abee9d842dce34b0c4271
2020-05-07 03:28:02 +00:00
Miguel Serrano
0583f7a667 Merge pull request #2746 from overleaf/ew-jpa-fix-deprecated-express-methods
[misc] fix express deprecations

GitOrigin-RevId: 78c730578c6a671f142837c98f98d5fd260332a5
2020-05-07 03:27:56 +00:00
Chrystal Maria Griffiths
f0bdd34823 Merge pull request #2796 from overleaf/cmg-covid-top-notification
Top notification for Coronavirus upgrade offer

GitOrigin-RevId: bdad53ebbcbec93034df5c652fe82d309f73f22d
2020-05-02 03:19:41 +00:00
Hugh O'Brien
6d078c4528 Merge pull request #2777 from overleaf/em-promisify-project-duplicator
Promisify ProjectDuplicator.duplicate()

GitOrigin-RevId: e7cfd8e3a9caca4608d0b57f6978474f3289f49e
2020-05-02 03:19:36 +00:00
Hugh O'Brien
7a315bfa4d Merge pull request #2759 from overleaf/hb-read-only-on-connection-lost
Read only mode on lost connection and local file contents on Out of Sync error

GitOrigin-RevId: e31a259be122ad162e98746cd06a7794a95e78fa
2020-05-02 03:19:31 +00:00
Paulo Jorge Reis
7f13e258bb Merge pull request #2697 from overleaf/pr-add-vat-number
Add VAT number and company name to the payment form

GitOrigin-RevId: 9ba2d7345f6f3cef1f7372e17c04243ab285e0bd
2020-04-30 03:19:59 +00:00
Chrystal Maria Griffiths
1c68d70929 Merge pull request #2782 from overleaf/cmg-wfh-dashboard
Change free trial offer in sidebar to WFH offer

GitOrigin-RevId: 770273c9cb85c03d0c80ca7b1a66572fe5683e6c
2020-04-29 03:22:19 +00:00
Timothée Alby
5d7fd2a9d8 Merge pull request #2751 from overleaf/ta-finish-login-private
Don't Export `afterLoginSessionSetup`

GitOrigin-RevId: 46818a70566b8ec56e1a40c7f0d9758d2ac2c100
2020-04-29 03:22:04 +00:00
Alasdair Smith
3a1ab63cce Merge pull request #2724 from overleaf/ns-doc-over-file
allow upload of doc over existing file

GitOrigin-RevId: 13578bf4ab6d54686077402488399db0379cc761
2020-04-28 03:21:52 +00:00
Ersun Warncke
a0bb38750a Revert "use user_id for tpds queue name"
This reverts commit 76d7badd001e0902e55d54efdca53d01124bcc77.

GitOrigin-RevId: 75e480660c6a1682cf20ba9575fd90f0ce726abc
2020-04-28 03:21:42 +00:00
Ersun Warncke
97ce66a9e7 use user_id for tpds queue name
GitOrigin-RevId: e61440efd22ef9e858b2862b1a6fd022c6eb70a4
2020-04-28 03:21:33 +00:00
Ersun Warncke
73d9d87b4d fix typo
GitOrigin-RevId: e0d95acb0c871558ed50b7456ca5783c893639fb
2020-04-28 03:21:29 +00:00
Ersun Warncke
59c26be6f2 fix tests, and placeholder while loading
GitOrigin-RevId: c3e4f31179423ed259cc2aab5b053e5c952350ff
2020-04-28 03:21:24 +00:00
Ersun Warncke
09667a3f6a show dropbox sync status on settings page
GitOrigin-RevId: 843950ea236bd80c605cf184959a7ce2d7895693
2020-04-28 03:21:19 +00:00
Simon Detheridge
7c00b2d838 Merge pull request #2772 from overleaf/revert-2767-spd-oio-moreurls
Revert "Add support for data urls and snip arrays to Open-in-Overleaf"

GitOrigin-RevId: c1e3806686764553d8801517b913f9133642fdb2
2020-04-25 03:19:03 +00:00
Simon Detheridge
dd59d8c242 Merge pull request #2770 from overleaf/spd-filestore-deletes
Delete project files in filestore when project is hard-deleted

GitOrigin-RevId: c836f94b2dc1967d84424ff1b65b1025b3499309
2020-04-25 03:18:55 +00:00
Simon Detheridge
9d8e682819 Merge pull request #2767 from overleaf/spd-oio-moreurls
Add support for data urls and snip arrays to Open-in-Overleaf

GitOrigin-RevId: 2c41406940b90c422cec8a823bf004fcc2655ed2
2020-04-25 03:18:50 +00:00
Eric Mc Sween
d8615ddba3 Merge pull request #2761 from overleaf/jpa-user-controller-bail-out-next
[UserController] updateUserSettings: bail out after calling next(err)

GitOrigin-RevId: f1905c0c54f3feb98836443cbf8e080888d4901c
2020-04-24 03:31:04 +00:00
Eric Mc Sween
27941dc8af Merge pull request #2760 from overleaf/em-faster-uploads
Make a single Mongo update when uploading projects

GitOrigin-RevId: de102d3e112c9014ca5885f963e35971e4db6cee
2020-04-24 03:30:55 +00:00
Eric Mc Sween
1dc325d1c7 Merge pull request #2750 from overleaf/ta-activate-finish-login
Don't Bypass FinishLogin on Password Reset

GitOrigin-RevId: 92567c893afb4aa64fa045151678d33c877d8f71
2020-04-24 03:30:45 +00:00
Miguel Serrano
6118a63783 Merge pull request #2712 from overleaf/jel-sso-ui-confirmed-domains
SSO UI only for confirmed domains

GitOrigin-RevId: cd8d7b93860a45d9527e717c6fc42876e9c9829e
2020-04-23 03:29:38 +00:00
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
Miguel Serrano
533b395210 Merge pull request #2753 from overleaf/ta-password-reset-inflight
Add Inflight UI To Password Reset Form

GitOrigin-RevId: 414e00d30e23d6964c8a6782d2bac52a239f868d
2020-04-23 03:29:07 +00:00
Miguel Serrano
e2bf647b81 Merge pull request #2763 from overleaf/ta-dot-dot-dot
Replace Triple-Dots with Ellipsis in Pug Files

GitOrigin-RevId: 408cea0772d8751acd8939e199e49e2cf9685b8f
2020-04-23 03:29:02 +00:00
Eric Mc Sween
5c6ddfd53a Merge pull request #2744 from overleaf/pr-add-visa-notice-tos
Add ToS link for new Visa free trial rules in the subscription form.

GitOrigin-RevId: 607f1057cee40b61b7910cb2afc1648dacfe49b6
2020-04-17 03:23:35 +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
Timothée Alby
ffe46658f6 Merge pull request #2734 from overleaf/ta-texlive-version-select
Make TeX Live Version Select Available To All Users

GitOrigin-RevId: 8209f2c3590f56296e916f104c7443f8ada3fc71
2020-04-15 03:15:12 +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
0099032963 Merge pull request #2732 from overleaf/ho-metrics-web-api
add metrics route to web api

GitOrigin-RevId: 7a39228d864545e4423d2c0c38ab0f16d495cf86
2020-04-09 03:21:27 +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
Simon Detheridge
0d442af07d Merge pull request #2733 from overleaf/ta-affiliations-space
Add Missing Space in Affiliation UI

GitOrigin-RevId: 8a9db0b410836ebd67dc3a48cdb06ba4924824b1
2020-04-09 03:21:15 +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
Timothée Alby
dea9730503 Merge pull request #2694 from overleaf/ta-jl-otp
Two Factor Authentication for Staff

GitOrigin-RevId: 7028e93cb4a4cd88c138a52b0528817056b930d9
2020-04-08 03:14:35 +00:00
Ersun Warncke
9057703531 Revert "Revert "only include recaptcha v2 on pages that use it""
This reverts commit a56afbdbbb749975b7e7f9cd47e0a7b2b784e75b.

GitOrigin-RevId: 9f3c029d9c4d9c3811e525ec1b6d8bf39ced4945
2020-04-07 03:18:51 +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
Ersun Warncke
6808262783 Revert "only include recaptcha v2 on pages that use it"
GitOrigin-RevId: a56afbdbbb749975b7e7f9cd47e0a7b2b784e75b
2020-04-01 03:21:21 +00:00
Alasdair Smith
db610f7efb Merge pull request #2657 from overleaf/revert-2650-revert-2570-as-sentry-source-maps
Bring back upload source maps to Sentry

GitOrigin-RevId: 22024e3ec2462d0bc9ad9c14e8d1c21880c55cd1
2020-04-01 03:21:16 +00:00
nate stemen
3bb0851f15 Merge pull request #2704 from overleaf/jel-ip-matcher-notification
Add space before institution name in IP notification

GitOrigin-RevId: 00d72b96ab88dfc0e7a3f827647db961ce008a65
2020-03-31 03:19:03 +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
3b1a5c458e Merge pull request #2699 from overleaf/jpa-test-perf
[perf] enable view caching for acceptance tests

GitOrigin-RevId: 696958a617392d20b594141aa316b5a80755ff38
2020-03-31 03:18:54 +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
nate stemen
78561cb393 Merge pull request #2703 from overleaf/ew-only-include-recaptcha-on-pages-that-use-it
only include recaptcha v2 on pages that use it

GitOrigin-RevId: 98b4e3add8e0a5a0b74530bf4155ebb47f69ba96
2020-03-31 03:18:41 +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
Eric Mc Sween
d68ebe7b41 Merge pull request #2684 from overleaf/sk-fix-subscription-track-changes-example
Fix the "added and removed" part of new-sub page

GitOrigin-RevId: d78c0f913531d521e9538a17b48b409cf0f2cc00
2020-03-25 04:16:49 +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
nate stemen
c301d8bc25 Merge pull request #2666 from overleaf/em-max-json-request-size
Separate max_doc_length from max JSON request size

GitOrigin-RevId: 4c725028111966bf04109080d80d4672273dd697
2020-03-19 04:17:05 +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
Timothée Alby
6734d9e107 Merge pull request #2641 from overleaf/ew-delete-orphaned-docs
Process and Script to Delete Orphaned Docs

GitOrigin-RevId: 0c428e36973a9131e3d379fdf4657e802576b23d
2020-03-10 04:14:46 +00:00
Timothée Alby
620b95fbe8 Merge pull request #2656 from overleaf/jpa-import-709
[misc] fileOperationI18nNames: drop blocking DOM access

GitOrigin-RevId: e6aab686fc8d4fe3b5515033b88548278c7bf7c0
2020-03-10 04:14:42 +00:00
Timothée Alby
fbbb39b0c0 Merge pull request #2620 from overleaf/ta-body-parser-errors
Convert Errors with Status Code To HTTP Errors

GitOrigin-RevId: 4c7abf4f9164c1a907fbf38c6e440409a616e047
2020-03-10 04:14:38 +00:00
Timothée Alby
a53174a4d6 Merge pull request #2660 from overleaf/jlm-fix-div-in-p
Remove div from inside p tag

GitOrigin-RevId: 2feea3786d7d737e2f8c8aa8d817f8e7cd1868ae
2020-03-10 04:14:33 +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