Commit graph

9282 commits

Author SHA1 Message Date
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
Alasdair Smith
bc1b73d74e Merge pull request #2515 from overleaf/as-transform-absolute-paths
Transform absolute paths in frontend to relative

GitOrigin-RevId: c1914c0fd09d68984ba6c85a1f00aa3e6858d944
2020-04-07 03:18:45 +00:00
Jakob Ackermann
1a09965503 Merge pull request #2719 from overleaf/jpa-custom-wsurl-for-beta-users
[frontend] ConnectionManager: add support for ie11

GitOrigin-RevId: ab1280f8da68fa87c266463e617b0a84a48065ce
2020-04-03 03:20:58 +00:00
Jakob Ackermann
d6fa1b1ca3 Merge pull request #2718 from overleaf/jpa-custom-wsurl-for-beta-users
[frontend] ConnectionManager: fix dumb string concat in socket.io v0

GitOrigin-RevId: a1c472623e07b020e498d621e9f3241f8afc44f6
2020-04-03 03:20:53 +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
Ersun Warncke
9d12d98855 report/sync on mongo/postgres entitlment mismatches
GitOrigin-RevId: 71258d5d7ca1b6700d70546f2c3be672f5524bef
2020-04-02 03:19:48 +00:00
Timothée Alby
be7a1abb13 Merge pull request #2693 from overleaf/ta-acceptance-user-helper
Improve UserHelper in Acceptance Tests

GitOrigin-RevId: 3dffc789a07197d6cc14715dee89da0feb40b506
2020-04-02 03:19:44 +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
Henry Oswald
694267603a Merge pull request #2711 from overleaf/ho-redis-1-0-12
bump redis to 1.0.12

GitOrigin-RevId: 9065a809617cd856db3d0af10811c705eb0efe77
2020-04-02 03:19:22 +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
1af99ac8b2 Merge pull request #2701 from overleaf/ns-cmg-dropdown-menus-grow
Remove flex rule on left menu selects to stop unnecessary growth

GitOrigin-RevId: 72ceb7b3e3b2375328c94943b84e7f85f024e7cc
2020-03-31 03:18:49 +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
Jakob Ackermann
bdbbe1d596 Merge pull request #2687 from overleaf/jpa-fix-failing-reconnect-caused-by-backend
[frontend] ConnectionManager: fix failing reconnects (caused by backend)

GitOrigin-RevId: f66e45fcb22849c2057b24eabde319ae7781ec51
2020-03-31 03:18:36 +00:00
Jakob Ackermann
4d67acc7f5 Merge pull request #2686 from overleaf/jpa-fix-parallel-reconnect
[frontend] ConnectionManager: fix parallel reconnect

GitOrigin-RevId: 38619b30dc38fd2732b77c0a785c8ab2857c81ff
2020-03-31 03:18:32 +00:00
Jakob Ackermann
2ce244d662 Merge pull request #2685 from overleaf/jpa-fix-out-of-sync-open-doc
[frontend] EditorManager: out-of-sync: wait for joinProject to complete

GitOrigin-RevId: d3006f2ad36c6094815aa892e65d2cf8c8243472
2020-03-31 03:18:27 +00:00
Eric Mc Sween
199e310f25 Merge pull request #2700 from overleaf/em-upgrade-metrics
Upgrade metrics-sharelatex to 2.6.2

GitOrigin-RevId: 29694016768e239a46d58aa3483375187addb09c
2020-03-26 04:17:47 +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
0ca191c947 Merge pull request #2688 from overleaf/em-upgrade-metrics
Upgrade metrics-sharelatex to 2.6.1

GitOrigin-RevId: 7ef2621b2e351b23bfffa9c5c4ce329bf53fcdef
2020-03-25 04:16:54 +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
3b027eba22 Merge pull request #2662 from overleaf/cmg-dont-always-scroll
Stop file tree item being scrolled to if it is already in view

GitOrigin-RevId: 7728bca54ab3bdc60537bd7699919240359e127d
2020-03-19 04:17:13 +00:00
nate stemen
3a2bdfe7f1 Merge pull request #2665 from overleaf/pr-fix-spelling-markers-safari
Spellcheck improvements + fix spelling markers being out of place

GitOrigin-RevId: fa70e257f96f78d3570c86871f85c79daf08014c
2020-03-19 04:17:09 +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
nate stemen
d717ebb2e0 Merge pull request #2676 from overleaf/ew-check-sso-cert-expirations
show expiration data and throw on date errors when loading certs

GitOrigin-RevId: d81c96c722f0ce20352f2ef9a346b6d9bfa028d1
2020-03-19 04:16:59 +00:00
Eric Mc Sween
7ade96473f Merge pull request #2682 from overleaf/em-revert-metrics-upgrade
Revert "Upgrade sharelatex-metrics to 2.6.0"

GitOrigin-RevId: 20665136094346dfd200c4fee3a85d99bbbef60d
2020-03-17 04:18:27 +00:00
Eric Mc Sween
5527cab2a2 Merge pull request #2680 from overleaf/jpa-fix-cache-bust
[frontend] fix cache busting: add timestamp unless build id is present

GitOrigin-RevId: ece768cb33af47182b920c894636d686dba02c3b
2020-03-17 04:18:23 +00:00
Eric Mc Sween
1749ab7099 Merge pull request #2668 from overleaf/jpa-fix-launchpad
[launchpad] remove the broken v1 registration

GitOrigin-RevId: 1a07076c0e7c0a24fb5aa6fb79ebbff9be4b9bba
2020-03-17 04:18:19 +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
Eric Mc Sween
574e6262a9 Merge pull request #2669 from overleaf/em-bump-metrics
Upgrade sharelatex-metrics to 2.6.0

GitOrigin-RevId: 0db5be16384f50ae39ce5831f006a94e7fa786b9
2020-03-17 04:18:07 +00:00
Eric Mc Sween
d772dbaceb Merge pull request #2673 from overleaf/ta-resync-subscriptions-fix
Resync Recurly Subscriptions Script Improvements

GitOrigin-RevId: b042465b7bffcbb73b40d1a7f23de784185d53ef
2020-03-17 04:18:03 +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
Timothée Alby
50ccc90815 Merge pull request #2664 from overleaf/ta-resync-subscriptions
Add Script To Resync Recurly Subscriptions

GitOrigin-RevId: 95f1263e5b3b782ec70d3d135f3c1866548a048f
2020-03-12 04:18:56 +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
403704710c Merge pull request #2648 from overleaf/msm-fix-multiresult-promisify
Added multiResult to ProjectEntityHandler.promises.getDoc

GitOrigin-RevId: 6a2807cdae822c188298b48887d0eff57edf12d4
2020-03-10 04:14:51 +00:00