Commit graph

18191 commits

Author SHA1 Message Date
Simon Detheridge
cb86ee8c10 Initialise metrics before logger 2020-07-23 13:35:52 +01:00
Simon Detheridge
4bb6509b9c Update object-persistor and make aws a dev dependency 2020-07-23 10:45:27 +01:00
Simon Detheridge
d5fd892f43 Merge pull request #7 from overleaf/spd-upgrade-packages
Bump dependency versions
2020-07-23 10:39:59 +01:00
Simon Detheridge
8037208800 Bump dependency versions 2020-07-23 10:33:01 +01:00
Miguel Serrano
b0dc73a61c Remove HttpErrors.InternalServerError (#3027)
* Added legacyInternal() 500 to HttpErrorHandler
* replaced HttpErrors.InternalServerError being thrown with calls to HttpHandler.legacyInternal()

GitOrigin-RevId: 0b7086a9693b57cdf93976d4221b90315960e8bb
2020-07-23 02:06:50 +00:00
Alasdair Smith
2bcbc84e0b Merge pull request #3010 from overleaf/hb-handle-invalid-filepath-error
Provide specific error on invalid file path upload

GitOrigin-RevId: 4b26da398f18fc03e812ea081accd96f05244cef
2020-07-23 02:06:43 +00:00
Alasdair Smith
4e18a81944 Merge pull request #3036 from overleaf/as-silence-sentry-errors
Silence some more expected/spurious frontend errors in Sentry

GitOrigin-RevId: e2ad049e83e53806b9233b51ae88288d16b36053
2020-07-23 02:06:38 +00:00
Alasdair Smith
0868d67d59 Merge pull request #3037 from overleaf/as-install-missing-dep
Install missing sanitize-html dependency

GitOrigin-RevId: d58a4fe27fbf28031fdc07b76bc9e38f5843c42a
2020-07-23 02:06:33 +00:00
Simon Detheridge
5329cf24b0 Remove unneeded @google-cloud/storage module from main deps 2020-07-22 17:18:17 +01:00
Simon Detheridge
89fc640ec4 Use METRICS_APP_NAME env var to initialise metrics, if present 2020-07-22 16:57:41 +01:00
Jakob Ackermann
68a5ec7c73 Merge pull request #171 from overleaf/jpa-fix-express-deprecations
[misc] fix express deprecations
2020-07-22 11:55:01 +02:00
Jakob Ackermann
5037162f3d Merge pull request #65 from overleaf/jpa-fix-express-deprecations
[misc] fix express deprecations
2020-07-22 11:10:21 +02:00
Jakob Ackermann
8e8a05e94f Merge pull request #64 from overleaf/jpa-rename-express-app-var
[misc] align the variable name of the express app with other services
2020-07-22 11:09:58 +02:00
Jakob Ackermann
562375d351 [misc] fix express deprecations 2020-07-22 09:45:14 +01:00
Jakob Ackermann
c4a60bb4e9 [misc] fix express deprecations 2020-07-22 09:32:39 +01:00
Jakob Ackermann
236292c2f8 [misc] align the variable name of the express app with other services 2020-07-22 09:22:19 +01:00
Jessica Lawshe
d492fab10c Merge pull request #3006 from overleaf/jel-wiki-toc
Wiki table of contents style

GitOrigin-RevId: dc4584c1528d4aba8b35490c546986a5ee3bbe31
2020-07-22 02:06:21 +00:00
Jessica Lawshe
8f773318c1 Merge pull request #3023 from overleaf/jel-add-user-audit-log
User audit log

GitOrigin-RevId: 687448d5da5d783c6db0fadb53c020cc9c3876b9
2020-07-22 02:06:16 +00:00
Jessica Lawshe
d8b2537f48 Merge pull request #2983 from overleaf/jel-security-emails
Add security email template and switch institution SSO alerts to use it

GitOrigin-RevId: c6f07655165e352527a9efbcfffc5bd2f635405c
2020-07-22 02:06:11 +00:00
Jessica Lawshe
10ef38fe76 Merge pull request #3029 from overleaf/jel-optimize-anti-flicker
Revert Use of ExposedSettings for Zotero experimentId

GitOrigin-RevId: 40ff3b2b4409f287c0e4630a30c0b72f70031f62
2020-07-22 02:06:06 +00:00
Simon Detheridge
988cb1174b Merge pull request #127 from overleaf/spd-logger-first
Load logger module first
2020-07-21 16:00:51 +01:00
Simon Detheridge
a64bbc9285 Load logger module first 2020-07-21 15:58:01 +01:00
Christopher Hoskin
a11ea11e31 Merge pull request #62 from overleaf/csh-acceptance-test-creds2
Move acceptance test cred to docker-compose-config.yml
2020-07-21 15:30:51 +01:00
Eric Mc Sween
c2c9a994ff Merge pull request #6 from overleaf/em-s3-options
Add S3 options: httpOptions, maxRetries
2020-07-21 08:23:38 -04:00
Christopher Hoskin
4cfeccf593 Revert "Revert "Move acceptance test cred config to docker-compose-config.yml""
This reverts commit 703447d33883b45d119ddccee1df4b9ad098b0c2.
2020-07-21 10:03:34 +01:00
Christopher Hoskin
19c871c5f8 Revert "Revert "Add note on running tests""
This reverts commit 81fdd6a5d1068cbb9f44adecc399e8871ce99dad.
2020-07-21 10:03:14 +01:00
Christopher Hoskin
ab63007391 Revert "Revert "Bump buildscript to 2.3.0""
This reverts commit 8f631e450cb17beac28fa6e62303bcb413562c46.
2020-07-21 10:02:43 +01:00
Christopher Hoskin
d5fba45a2e Revert "Bump buildscript to 2.3.0"
This reverts commit 57b9d3ef79f0b8bf466cb3a66c27eda92d21c05f.
2020-07-21 09:59:19 +01:00
Christopher Hoskin
942c4b6fbe Revert "Add note on running tests"
This reverts commit 735084fef85f9721849184958b64a50eed65cea0.
2020-07-21 09:59:07 +01:00
Christopher Hoskin
e6a2a1922a Revert "Move acceptance test cred config to docker-compose-config.yml"
This reverts commit e59452567f79540c303b6451638bfe83b294fb79.
2020-07-21 09:58:44 +01:00
Christopher Hoskin
6b92c5d21d Move acceptance test cred config to docker-compose-config.yml 2020-07-21 09:37:48 +01:00
Christopher Hoskin
b42a945a1d Add note on running tests 2020-07-21 09:29:45 +01:00
Christopher Hoskin
bd4b9ed177 Bump buildscript to 2.3.0 2020-07-21 09:23:23 +01:00
Eric Mc Sween
5b0d5447da Merge pull request #2999 from overleaf/as-em-fix-double-updates-load
Fix history loading updates twice on scroll

GitOrigin-RevId: 964863c7357eef36b2833c7b1e8ebaa07020fb2c
2020-07-21 02:06:42 +00:00
Eric Mc Sween
c200511f86 Merge pull request #3016 from overleaf/ta-editor-load-events
Fix Editor Load Events

GitOrigin-RevId: bb23f17ccab2d53933ad9da870f8ce26fdd169df
2020-07-21 02:06:37 +00:00
Eric Mc Sween
60bdd4641a Merge pull request #3026 from overleaf/bg-fix-size-limit-check
fix clsi size limit check

GitOrigin-RevId: 1d26ddbe367e8873c57d35056d5b8cbddf614656
2020-07-21 02:06:29 +00:00
Eric Mc Sween
88b5a4534c Merge pull request #3022 from overleaf/as-react-linting
Add some more React linting

GitOrigin-RevId: 77ffa24d2c1ac68b547a0b5706287567bf5eda5d
2020-07-21 02:06:23 +00:00
Eric Mc Sween
f251d661ed Merge pull request #3021 from overleaf/msm-oerror-remove-conflict-error
Replace ConflictError thrown with calls to HttpErrorHandler.conflict()

GitOrigin-RevId: 3b4d98af1b31e49ceab4b1b55b94b8f0323c8a9b
2020-07-21 02:06:18 +00:00
Jakob Ackermann
51fb2170b2 Merge pull request #168 from overleaf/jpa-use-socket.io-forks
[misc] use overleaf/socket.io and overleaf/socket.io-client forks
2020-07-20 12:32:44 +02:00
Jakob Ackermann
f165131647 Merge pull request #62 from overleaf/jpa-import-37
[ASpell] error handling of cache dump: fix an async fs function call
2020-07-20 11:44:42 +02:00
John Lees-Miller
0cebce64c8 Merge pull request #11 from overleaf/dependabot/npm_and_yarn/lodash-4.17.19
Bump lodash from 4.17.15 to 4.17.19
2020-07-20 09:50:34 +01:00
dependabot[bot]
98e4444585 Bump lodash from 4.17.15 to 4.17.19
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-18 15:48:52 +00:00
Paulo Jorge Reis
4773494b55 Merge pull request #3025 from overleaf/pr-fix-safari-truncated-context-menu
Fix Safari file tree bug

GitOrigin-RevId: e1853585aacce548cd72c94d0840f9c4fc3fa6bd
2020-07-18 02:05:57 +00:00
dependabot[bot]
2c088b3d20 Bump lodash from 4.17.15 to 4.17.19
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-17 17:09:14 +00:00
Brian Gough
d415ae0cbe remove gruntfile 2020-07-17 16:23:01 +01:00
Brian Gough
671c243025 npm audit fix 2020-07-17 16:19:44 +01:00
Brian Gough
a0f856cff2 fix tests 2020-07-17 16:17:18 +01:00
Brian Gough
747a80b545 decaffeinate 2020-07-17 16:01:58 +01:00
Brian Gough
e31a819636 remove statsd 2020-07-17 15:36:37 +01:00
Jessica Lawshe
88057c4caa Merge pull request #3003 from overleaf/jel-zotero-event
Add Google Analytics event for Zotero A/B test

GitOrigin-RevId: 2b97a6070828fb97ea741a6e355c20314f59faad
2020-07-17 02:07:35 +00:00