Commit graph

8832 commits

Author SHA1 Message Date
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
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
Timothée Alby
d4fc866984 Merge pull request #2658 from overleaf/jpa-import-makefile-changes
[misc] import Makefile changes

GitOrigin-RevId: 6b19abd48cc40bdbaab6b0005711c9c2cca292f7
2020-03-10 04:14:29 +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
nate stemen
818d19bd69 Merge pull request #2654 from overleaf/sk-ns-fix-tag-count-for-real
Ensure tag count doesn't include trashed projects

GitOrigin-RevId: d1ccafe8b8553378c8d25504494d790ee342fedb
2020-03-06 04:13:38 +00:00
Eric Mc Sween
34a40296f4 Merge pull request #2652 from overleaf/jel-new-file-scope
Maintain scope in new file modal

GitOrigin-RevId: f4a39dfefbbcb75f5a3fb8fe23cb71a186b575dd
2020-03-05 04:17:05 +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
43d47ee35f Merge pull request #2582 from overleaf/ew-hackathon
Code mod to convert logger.warn/error to OError wrapper

GitOrigin-RevId: 0150cc7341d5a6cabe54c657947b135c23349073
2020-03-05 04:16:54 +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
d20518fdd4 Merge pull request #2624 from overleaf/hb-warning-nearing-file-limit
Show warning near or above file limit in upload modal

GitOrigin-RevId: 75e7c41e526ccde9516f7caf6ef1b9cbc59c2439
2020-03-04 04:21:48 +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
Alasdair Smith
ad361a6617 Merge pull request #2650 from overleaf/revert-2570-as-sentry-source-maps
Revert "Upload source maps to Sentry"

GitOrigin-RevId: 6f6a122209553b9fde664ff55ebec37f7cb6ef7e
2020-03-04 04:21:39 +00:00
Eric Mc Sween
a11a4ac614 Merge pull request #2570 from overleaf/as-sentry-source-maps
Upload source maps to Sentry

GitOrigin-RevId: badbce7a5a72c3c2b5ad61d1ab2e458a52128e37
2020-03-04 04:21:34 +00:00
Eric Mc Sween
60b5bf14e0 Merge pull request #2642 from overleaf/jel-sso-confirm-notification
Extend _ssoAvailable check on dash frontend

GitOrigin-RevId: a549ba86286361481114b9f0355c5741ac3ab921
2020-03-04 04:21:30 +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
1f89083ab2 Merge pull request #2632 from overleaf/as-remove-minjs
Remove mirroring frontend JS to public/minjs directory

GitOrigin-RevId: f199530161dcd6d54800d148188f4e0b21b8df66
2020-03-03 04:21:53 +00:00
Eric Mc Sween
506bc44336 Merge pull request #2621 from overleaf/jpa-ns-empty-history
Add messaging to projects with empty history

GitOrigin-RevId: 3fab0b115d35ec3d7f7d1ffa5603b7c7d3423c94
2020-03-03 04:21:48 +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
Timothée Alby
bb722f3bff Merge pull request #2628 from overleaf/jel-backfill-sso
Add script to backfill SSO affiliations

GitOrigin-RevId: 5dc6678531311871b09fd79ed96f45f718753ad5
2020-02-29 04:17:27 +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
130f97d621 Merge pull request #2625 from overleaf/bg-fix-spelling-stateful-regexp
fix stateful regexp usage in SpellCheckManager

GitOrigin-RevId: 6ac93e6a9227a638b30882ce99771e30c1a097c1
2020-02-28 04:18:37 +00:00
Eric Mc Sween
5f712645ed Merge pull request #2626 from overleaf/bg-fix-editor-regexps
fix stateful regexp usage in editor inputs

GitOrigin-RevId: 4950066251cb6235e218ff4f600fab2652d15e76
2020-02-28 04:18:33 +00:00
Eric Mc Sween
c120309dd0 Merge pull request #2591 from overleaf/pr-avoid-out-of-sync-error-spellcheck
Avoid out of sync error spellcheck

GitOrigin-RevId: e9772c01ffc0ffaca5d137e8e43e797903b727cd
2020-02-28 04:18:29 +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
e80870f453 Merge pull request #2629 from overleaf/cmg-updateon-typo
Fix typo in user settings

GitOrigin-RevId: 066ee8047d807e9ac077eb687a93f12d9db6bf55
2020-02-28 04:18:21 +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
17969c50ce Merge pull request #2611 from overleaf/ta-cmg-recurly-email-update-test-plus
Improve Recurly API Acceptance Test

GitOrigin-RevId: 89f4707c9baaa20e59f64821daa36551ad700118
2020-02-28 04:18:13 +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
Eric Mc Sween
403c9ae66b Merge pull request #2627 from overleaf/jel-decaf-cleanup
Decaf cleanup

GitOrigin-RevId: 9e0770ce6c5362ea288fc1706014aacd45608008
2020-02-28 04:18:04 +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
Brian Gough
ac5d688d8c Merge pull request #2612 from overleaf/bg-precompile-web-views-only
only precompile views for web, not web-api

GitOrigin-RevId: 292f4d5dd6f81b1928ccd543898dfa643f1e5be8
2020-02-27 04:17:55 +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
Timothée Alby
506543d6a0 Merge pull request #2605 from overleaf/jel-sso-registration
Do not block SSO registration on nonessential errors

GitOrigin-RevId: c9d6a7803aa8a48dbc1a8aae84d6f2588bad654e
2020-02-21 04:21:07 +00:00
Timothée Alby
b94e1791e0 Merge pull request #2617 from overleaf/ho-open-site-for-admins
allow site to be accessible to admins when closed

GitOrigin-RevId: 71bdf329ce2a4e41533b2a65f45190277ea72dbb
2020-02-21 04:21:03 +00:00
Timothée Alby
98f031e9aa Merge pull request #2619 from overleaf/ta-licence-attribute-fix
Read Licence Attribute from Affiliation Instead of Institution

GitOrigin-RevId: 2294222e2bd0da473a303d3ffdc5ddb7d856f7f7
2020-02-21 04:20:59 +00:00
nate stemen
ab5101f189 Merge pull request #2613 from overleaf/spd-tags-timeout
Use a longer timeout when talking to the tags API

GitOrigin-RevId: 467f981c1818293c28dd288d7223540597a8ca3e
2020-02-21 04:20:55 +00:00
nate stemen
10d6a9b7f2 Merge pull request #2589 from overleaf/ns-hide-v1-projects
ensure v1 projects folder not shown on dashboard if empty

GitOrigin-RevId: d8c0f1352fc2e8d891eb76f7d1ef00126a4f581e
2020-02-21 04:20:49 +00:00
nate stemen
3b70e080b1 Merge pull request #2601 from overleaf/jpa-hotfix-autocomplete-deleted-docs
[autocomplete] ignore deleted docs for completion

GitOrigin-RevId: 9f39bbb90d443e7a1691ff5558742e4d12f4eb4d
2020-02-21 04:20:45 +00:00
Simon Detheridge
cae6cf6efa Merge pull request #2592 from overleaf/jel-html-inst-table-script
Add script to generate institution row in list

GitOrigin-RevId: 8dfb7396626c229ff2a7e9441a3fa5ae247d06bb
2020-02-19 04:20:51 +00:00
Simon Detheridge
ab80c72565 Merge pull request #2602 from overleaf/hb-too-many-files-errors
Too many files errors for new files modal

GitOrigin-RevId: a9e2db2e4d8624de4e062161781067ee0c68c4e0
2020-02-19 04:20:47 +00:00
Simon Detheridge
bb3394885c Merge pull request #2604 from overleaf/cmg-duplicate-modal-root
Stop duplicate file modal appearing when moving back to original folder - root edition

GitOrigin-RevId: 11fe3b2457190f8bada010a344143a66b8967f34
2020-02-19 04:20:43 +00:00
Simon Detheridge
b812109cb7 Merge pull request #2593 from overleaf/ta-affiliation-licence-check
Check Licence on Affiliations Rather Than Institutions

GitOrigin-RevId: 7effe7f564ff953e60ed77bcdf92f3cb177d4aee
2020-02-19 04:20:39 +00:00
Simon Detheridge
19266bbc8a Merge pull request #2598 from overleaf/sk-upgrade-mongoose-4.13.19
Upgrade mongoose to 4.13.19

GitOrigin-RevId: 73c111d5d351a16efc01738e2148e9ab5daf4541
2020-02-19 04:20:34 +00:00
Timothée Alby
cd9a9b43bd Merge pull request #2606 from overleaf/ta-check-sso-users
Add SSO Users Info on Users Features Check Summary

GitOrigin-RevId: 5c874e1bf50005eb311317b867b17380ca017118
2020-02-15 04:17:53 +00:00
Brian Gough
69a98355ce Merge pull request #2599 from overleaf/bg-fix-safepath-check
fix safepath check

GitOrigin-RevId: b5bb636d2bd958ab142fa94683ad9cf58369a77d
2020-02-14 04:16:44 +00:00
Simon Detheridge
1c6ad2b7db Merge pull request #2569 from overleaf/as-build-changes
Build changes required for passing secrets into docker build

GitOrigin-RevId: 46c221bd0f0e3ec4ec02384afb252c532d688516
2020-02-13 04:20:58 +00:00
Simon Detheridge
de40289b38 Merge pull request #2588 from overleaf/ns-add-text-extensions
add more extensions to editable files

GitOrigin-RevId: f2a52eee148a78c8cb3623f27e25f2e0801ef835
2020-02-13 04:20:53 +00:00
Simon Detheridge
9e6323caeb Merge pull request #2584 from overleaf/spd-duplicate-deleted-things
Prevent creation of (and clean up) duplicate deletedUsers and deletedProjects

GitOrigin-RevId: 5e52578b514f05779290c61cf7d4e630cc3ba6f7
2020-02-13 04:20:49 +00:00
Simon Detheridge
73defe82d9 Merge pull request #2561 from overleaf/pr-reduce-spellcheck-initial-req
Reduce spellcheck initial (and subsequent) requests

GitOrigin-RevId: 81eee359ea1bc740991ba84b0fe121c37cb4c6a2
2020-02-13 04:20:44 +00:00
Simon Detheridge
72c5286622 Merge pull request #2587 from overleaf/msm-ns-disable-comment-button
disable "add comment" button if feature is not available

GitOrigin-RevId: e054f138a84ec634cc777d76e8a288ba2c1b2ee3
2020-02-13 04:20:40 +00:00
Simon Detheridge
96cd1c869e Merge pull request #2583 from overleaf/spd-no-mongoredis-in-unittests
Clean up attempts to connect to Mongo and Redis in unit tests

GitOrigin-RevId: 396813a04fc2aaf39a07e28613f8f1e0a7a2db8f
2020-02-13 04:20:35 +00:00
Jakob Ackermann
5c7251afce Merge pull request #2596 from overleaf/jpa-build-scripts-1-3-5
[misc] align the Dockerfile to the build scripts version 1.3.5

GitOrigin-RevId: cdda059b68068b9b4de87520cff91ce179426836
2020-02-13 04:20:31 +00:00
Chrystal Maria Griffiths
4131e5ce7b Merge pull request #2585 from overleaf/cmg-remove-legacy-archive
Remove legacy project archiving

GitOrigin-RevId: a402cde154cdc2ef5e93661318c5ca86201471b5
2020-02-13 04:20:26 +00:00
Chrystal Maria Griffiths
3785be1fec Merge pull request #2566 from overleaf/cmg-invalid-filename
Suppress error for empty filename when still editing

GitOrigin-RevId: 42d7fa9af9b183603577effb5d1daaafa21ce065
2020-02-13 04:20:22 +00:00
Brian Gough
80e9afe42c Merge pull request #2586 from overleaf/bg-simplify-rate-limit-metrics
simplify metric for rate limits

GitOrigin-RevId: bba98c7e38846aedcfcf0781003f755e302f7759
2020-02-13 04:20:17 +00:00
Jessica Lawshe
401ed57890 Merge pull request #2577 from overleaf/jel-notifications-decaf-cleanup
Decaf cleanup for notifications on dashboard

GitOrigin-RevId: ee8b30cf3af8078d8455bd85b89e6156f3993412
2020-02-12 04:21:14 +00:00
Jessica Lawshe
528b2b5728 Merge pull request #2563 from overleaf/jel-add-affiliation-when-registering
Add affiliation when registering

GitOrigin-RevId: e1915bbdc0a4fef399ef9b4a2154ede31e282cc3
2020-02-12 04:21:10 +00:00
Jessica Lawshe
222ba263ff Merge pull request #2552 from overleaf/jel-update-pdfjs
Update PDF.js

GitOrigin-RevId: 231ab11eccc32e4eddc87fc8829dd28843e41a51
2020-02-12 04:21:05 +00:00
Ersun Warncke
353625be51 Revert "Revert "Revert "decaf clean up"""
This reverts commit 4a3933668a0d01912e748c164581bcb9bbded0dd.

GitOrigin-RevId: 829a5c65093200db066f5852e42bd4f88d4c299a
2020-02-12 04:21:00 +00:00
Ersun Warncke
ba253bee12 Revert "Revert "Revert "clear rootDoc_id when deleting doc, reset on compiles if invalid"""
This reverts commit 034ae6fa4d8515944683395ef14d99801829cb6a.

GitOrigin-RevId: 16801e6f35e1ee879d36ca46e262f8bb6e506a54
2020-02-12 04:20:56 +00:00
Ersun Warncke
b4cdfc43cf Revert "Revert "Revert "format fix"""
This reverts commit abb3f94c50b94cd87012d9e55c40afd9cbfe97e0.

GitOrigin-RevId: 090e01b96222024341e3c988ec3ba4c9fa1eef11
2020-02-12 04:20:52 +00:00
Ersun Warncke
02140124bd Revert "Revert "Revert "wip"""
This reverts commit 80bc280977d25e3ba554c32242fddfb3e15915e6.

GitOrigin-RevId: 563ed572aad616d98cd81e0acf649df8f063aa3a
2020-02-12 04:20:47 +00:00
Ersun Warncke
9228fbd026 Revert "Revert "Revert "optimize rootDoc_id validation"""
This reverts commit f015bc2bb54e98d1271bc2417647638aa80ba843.

GitOrigin-RevId: ca8380891a0e71713ed33f200720a9ab92db6ef3
2020-02-12 04:20:43 +00:00
Ersun Warncke
9c61681ae2 Revert "Revert "Revert "log errors"""
This reverts commit 3911f3380767ae2e24b3694ef21c4eb73a7219b3.

GitOrigin-RevId: 9b2fe77881ab871f0919487b45b4fc78c48147fd
2020-02-12 04:20:38 +00:00
Ersun Warncke
67e89b9d80 Revert "Revert "Revert "add ensureRootDocumentIsValidForProject method"""
This reverts commit aced9579ed1f4b0ab1780be0f4f45ae8d6a405a5.

GitOrigin-RevId: 90df39b8b90197c53ee80ffbb9ee61fa3b4ba905
2020-02-12 04:20:34 +00:00
Ersun Warncke
b1c904f824 Revert "Revert "Revert "use ProjectRootDocManager in ClsiManager"""
This reverts commit 14c94880804a3567e2b91e314a707a47bb74be2c.

GitOrigin-RevId: 9039335d01e90cf240f627a7c35889c9ab994a63
2020-02-12 04:20:30 +00:00
Ersun Warncke
b57ee58883 Revert "fix acceptance tests"
This reverts commit 7e61102f91654431761f5f72b4355c6e5954b0d7.

GitOrigin-RevId: e93c5e079c8b83a77e7a74065c23afb17c9369b3
2020-02-12 04:20:25 +00:00
Ersun Warncke
a6a624eaa3 Revert "format fix"
This reverts commit ed06e07c536e3faa984326a02bbc633b7837e859.

GitOrigin-RevId: b4ed8349c9867838442af9c06a2a1a54fe40e57b
2020-02-12 04:20:21 +00:00
Ersun Warncke
5abb9ab855 format fix
GitOrigin-RevId: ed06e07c536e3faa984326a02bbc633b7837e859
2020-02-12 04:20:17 +00:00
Ersun Warncke
b4fbb0c9fc fix acceptance tests
GitOrigin-RevId: 7e61102f91654431761f5f72b4355c6e5954b0d7
2020-02-12 04:20:12 +00:00
Ersun Warncke
22fcbe8648 Revert "Revert "use ProjectRootDocManager in ClsiManager""
This reverts commit 98c0b9246eb29a9d0bdab14a04d456473a1b4a14.

GitOrigin-RevId: 14c94880804a3567e2b91e314a707a47bb74be2c
2020-02-12 04:20:08 +00:00
Ersun Warncke
725a3c5282 Revert "Revert "add ensureRootDocumentIsValidForProject method""
This reverts commit 80bb46f92f200f48fc39138afb27df729959888c.

GitOrigin-RevId: aced9579ed1f4b0ab1780be0f4f45ae8d6a405a5
2020-02-12 04:20:03 +00:00
Ersun Warncke
d0ada551fa Revert "Revert "log errors""
This reverts commit 0db1d89ac75bf80e1d28dbd02110809fa24f4a9f.

GitOrigin-RevId: 3911f3380767ae2e24b3694ef21c4eb73a7219b3
2020-02-12 04:19:59 +00:00
Ersun Warncke
f326d632ab Revert "Revert "optimize rootDoc_id validation""
This reverts commit 13e4b22daa99b096cf2a9625212a855be59b1fdc.

GitOrigin-RevId: f015bc2bb54e98d1271bc2417647638aa80ba843
2020-02-12 04:19:54 +00:00
Ersun Warncke
1c77077e71 Revert "Revert "wip""
This reverts commit f817ac652e35e9ed79db8d24c4144460e4cc0f71.

GitOrigin-RevId: 80bc280977d25e3ba554c32242fddfb3e15915e6
2020-02-12 04:19:50 +00:00
Ersun Warncke
7e200d2aea Revert "Revert "format fix""
This reverts commit 4617b9ec2ed63b14418a8510a214e58397314831.

GitOrigin-RevId: abb3f94c50b94cd87012d9e55c40afd9cbfe97e0
2020-02-12 04:19:45 +00:00
Ersun Warncke
93bf7cc4db Revert "Revert "clear rootDoc_id when deleting doc, reset on compiles if invalid""
This reverts commit 7acba5876581044a08d6deb4767a4a2196dcb765.

GitOrigin-RevId: 034ae6fa4d8515944683395ef14d99801829cb6a
2020-02-12 04:19:41 +00:00
Ersun Warncke
a581ef7609 Revert "Revert "decaf clean up""
This reverts commit 669ce8b6411309cbab3162cf94bd03399581eeb4.

GitOrigin-RevId: 4a3933668a0d01912e748c164581bcb9bbded0dd
2020-02-12 04:19:36 +00:00
Jakob Ackermann
6185fe8a30 Merge pull request #2581 from overleaf/jpa-change-base-image
[misc] use node:10.19.0 as base image

GitOrigin-RevId: c66ab9df06533261b12883c328673572f76b1647
2020-02-08 04:14:43 +00:00
Brian Gough
84829abf9a Merge pull request #2578 from overleaf/update-node-10
update to gcr.io/overleaf-ops/node:10.19.0

GitOrigin-RevId: f0eac5e6397842de5f931d145526de3e0a54336b
2020-02-06 04:20:16 +00:00
Jessica Lawshe
f2636e0555 Merge pull request #2572 from overleaf/ta-personal-plan-test
Personal Plan Filter Test

GitOrigin-RevId: e0e75bdd43b27cda787d039f9cfaad64e96afa67
2020-02-06 04:20:09 +00:00
Jessica Lawshe
7844037404 Merge pull request #2573 from overleaf/jel-settings-decaf-cleanup
Decaf cleanup for affiliations on user settings

GitOrigin-RevId: 05f81009ce86896f7d906a0f13606550c64a8bff
2020-02-06 04:20:03 +00:00
Jessica Lawshe
0a5f7c05a3 Merge pull request #2559 from overleaf/jel-optimize-anti-flicker
Add Google Optimize anti-flicker snippet

GitOrigin-RevId: b3414a03e76ca699923a55221613c07fa7044fb3
2020-02-06 04:19:57 +00:00
Ersun Warncke
a9d7c270a3 Revert "decaf clean up"
This reverts commit e892b7ef6a1c8f5ad79879c0ecaf10e46a35aad7.

GitOrigin-RevId: 669ce8b6411309cbab3162cf94bd03399581eeb4
2020-02-06 04:19:51 +00:00
Ersun Warncke
76a6c399e3 Revert "clear rootDoc_id when deleting doc, reset on compiles if invalid"
This reverts commit 539982adbf55014400f4aff94195e7f567cda676.

GitOrigin-RevId: 7acba5876581044a08d6deb4767a4a2196dcb765
2020-02-06 04:19:46 +00:00
Ersun Warncke
d8b627f59b Revert "format fix"
This reverts commit 71faf86ccd19dfa6428c2d5bcc8c88ec7f0ee41f.

GitOrigin-RevId: 4617b9ec2ed63b14418a8510a214e58397314831
2020-02-06 04:19:41 +00:00
Ersun Warncke
71d0036e8e Revert "wip"
This reverts commit 81103ae6d7c0c22eb24da6ed6577223ba16e8861.

GitOrigin-RevId: f817ac652e35e9ed79db8d24c4144460e4cc0f71
2020-02-06 04:19:36 +00:00
Ersun Warncke
d12e890f27 Revert "optimize rootDoc_id validation"
This reverts commit f19d02674f7d0d47531be7586bc47628601a7231.

GitOrigin-RevId: 13e4b22daa99b096cf2a9625212a855be59b1fdc
2020-02-06 04:19:31 +00:00
Ersun Warncke
575a6e82f9 Revert "log errors"
This reverts commit 3c507435956b3d312b00fefda1d4a996b6a45d62.

GitOrigin-RevId: 0db1d89ac75bf80e1d28dbd02110809fa24f4a9f
2020-02-06 04:19:25 +00:00
Ersun Warncke
93c8779ff7 Revert "add ensureRootDocumentIsValidForProject method"
This reverts commit 5b9191bce2fe1de85c573ed533521e53f08d146b.

GitOrigin-RevId: 80bb46f92f200f48fc39138afb27df729959888c
2020-02-06 04:19:20 +00:00
Ersun Warncke
e018663af5 Revert "use ProjectRootDocManager in ClsiManager"
This reverts commit 4687a9be32c34e9ea92b2b53cb72d71242e7dfa1.

GitOrigin-RevId: 98c0b9246eb29a9d0bdab14a04d456473a1b4a14
2020-02-06 04:19:14 +00:00
Brian Gough
f53f70cdc7 use ProjectRootDocManager in ClsiManager
GitOrigin-RevId: 4687a9be32c34e9ea92b2b53cb72d71242e7dfa1
2020-02-06 04:19:09 +00:00