Commit graph

17886 commits

Author SHA1 Message Date
Brian Gough
2895b867cf Merge pull request #18 from overleaf/jpa-csh-tracing-end-time-from-fs
[checkLogLevel] read the updated tracing end time from disk
2020-06-30 16:04:34 +01:00
Christopher Hoskin
52649c9d0b 2.1.0 2020-06-30 14:00:15 +01:00
Christopher Hoskin
fa8df5cc0b Format:fix 2020-06-30 13:56:13 +01:00
Christopher Hoskin
9e54503d1b Add prettier-eslint-cli to dev-dependencies 2020-06-30 13:55:24 +01:00
Christopher Hoskin
c93ee44879 Update acorn dependency (via eslint) https://github.com/advisories/GHSA-6chw-6frg-f759 2020-06-30 13:53:34 +01:00
Jakob Ackermann
aa02df7b81 [misc] apply review feedback
- move setting into clsi.docker namespace
- rename the variable for images to allowedImages / ALLOWED_IMAGES
- add an additional check for the image name into the DockerRunner

Co-Authored-By: Brian Gough <brian.gough@overleaf.com>
2020-06-30 12:01:21 +01:00
Miguel Serrano
522e04d769 Merge pull request #86 from overleaf/msm-remove-source-maps
Remove source maps
2020-06-30 12:24:06 +02:00
Miguel Serrano
af3be13cf3 Merge pull request #87 from overleaf/msm-set-s3mock-image-latests
Removed pinned version of adobe/s3mock docker image
2020-06-30 12:18:28 +02:00
Timothée Alby
1012dbc3c4 Merge pull request #2961 from overleaf/ta-spike-outline
Document Outline Spike

GitOrigin-RevId: adc315a3546147eb10c7a40ae70f9cab1cbf7b8d
2020-06-30 02:10:19 +00:00
Chrystal Maria Griffiths
05abdd18d7 Merge pull request #2935 from overleaf/cmg-covid-upgrades
Add script for WFH offer ending

GitOrigin-RevId: b9291824a0712740d5d40439f759eb8a7d11d9ca
2020-06-30 02:10:14 +00:00
Jakob Ackermann
a77222470b [misc] WebsocketControllerTests: always pass cb to updateClientPosition
...and fix the inconsistent async behaviour for logged-in vs anonymous
 users in the app.
2020-06-29 18:11:33 +01:00
Jakob Ackermann
4d01c02946 [misc] WebsocketControllerTests: explicitly pass a cb to leaveProject
...and fix the stubbing of `io.sockets.clients`.

We were running the assertions prior to the actual completion of the
 leaveProject. Which in turn shadowed the broken test setup --
 `io.sockets.clients()` was returning the `this.clientsInRoom=[]` from a
 previous context.
2020-06-29 17:38:22 +01:00
Jakob Ackermann
bea0e9beb7 [misc] RoomManagerTests: explicitly pass a cb to joinProject/joinDoc 2020-06-29 17:12:26 +01:00
Miguel Serrano
39069e6b52 Merge pull request #757 from overleaf/msm-hotfix-2.3.1
Hotfix 2.3.1: Fixed synctex
2020-06-29 17:10:26 +02:00
Miguel Serrano
4dba0a3170 Removed pinned version of adobe/s3mock docker image 2020-06-29 12:59:38 +02:00
Jakob Ackermann
153a9c5790 Merge pull request #2953 from overleaf/jpa-nocache
[misc] Server: invoke the nocache middleware explicitly and add test

GitOrigin-RevId: 3238b07ebf5963ae95ef3f353e4745d283795fba
2020-06-27 02:10:30 +00:00
Jakob Ackermann
ccb5811cb6 Merge pull request #2945 from overleaf/jpa-pug-compileDebug-false
[misc] disable debug mode for pre-compile of pug templates by default

GitOrigin-RevId: 0a6798eec577f1be24017ba91f1378b16d80b528
2020-06-27 02:10:24 +00:00
Shane Kilkelly
395c558d77 Merge pull request #80 from overleaf/sk-health-check-trailing-slash
Handle HEAD method, and trailing slash on status and health-check calls
2020-06-26 14:52:22 +01:00
Shane Kilkelly
e7b19ea4a0 Update src/main/java/uk/ac/ic/wlgitbridge/server/StatusHandler.java
Co-authored-by: John Lees-Miller <jdleesmiller@gmail.com>
2020-06-26 13:37:18 +01:00
Shane Kilkelly
4161416659 Update src/main/java/uk/ac/ic/wlgitbridge/server/HealthCheckHandler.java
Co-authored-by: John Lees-Miller <jdleesmiller@gmail.com>
2020-06-26 13:37:09 +01:00
Jakob Ackermann
c857371fed [misc] wordcount: restrict image to an allow list and add tests 2020-06-26 13:28:12 +01:00
Jakob Ackermann
8846efe7ce [misc] RequestParser: restrict imageName to an allow list and add tests 2020-06-26 13:28:09 +01:00
Shane Kilkelly
5e31a11938 Respond to HEAD request in /status, /health_check 2020-06-26 11:54:18 +01:00
Jessica Lawshe
176c0f3742 Merge pull request #2942 from overleaf/jel-css-is-overleaf
Start removing is-overleaf from CSS

GitOrigin-RevId: fa37bedd857fc492f8d2e1df1758e2e5f924f000
2020-06-26 02:10:02 +00:00
Shane Kilkelly
a9a7f54a96 Handle trailing slash on status and health_check 2020-06-25 16:43:57 +01:00
Ersun Warncke
e83f6b609b pr fixes 2020-06-25 08:27:14 -04:00
Miguel Serrano
f8ca906393 Fixed NPE when Settings.clsi is defined but Settings.clsi.docker is not 2020-06-25 12:31:10 +02:00
Miguel Serrano
c2575ad666 Fixed syntex 2020-06-25 12:29:29 +02:00
Ersun Warncke
0e4be81406 upgrade to o-error v3 2020-06-24 22:40:04 -04:00
Jakob Ackermann
5e191be171 [misc] replace console logging with logger-sharelatex 2020-06-24 11:12:22 +01:00
Jakob Ackermann
fa42166be3 [misc] ignore camelcase warning in settings (key_schema parameter) 2020-06-24 10:52:38 +01:00
Jakob Ackermann
9c7bfe020c [misc] fix eslint errors in app.js 2020-06-24 10:52:38 +01:00
Jakob Ackermann
c76bcb7732 [misc] fix eslint errors in XMLHttpRequest.js 2020-06-24 10:52:37 +01:00
Jakob Ackermann
b8b3fb8b11 [misc] fix usage of deprecated node apis 2020-06-24 10:52:21 +01:00
decaffeinate
53058452ee prettier: convert miscellaneous files to Prettier format 2020-06-24 10:28:28 +01:00
Jakob Ackermann
991c4f9876 Merge pull request #2928 from overleaf/jpa-sentry-unified-release-and-env-annotation
[misc] expose release and environment to frontend

GitOrigin-RevId: 2adab7cfb2c63f6d5bc34c367393449c84ef2690
2020-06-24 02:10:53 +00:00
Jakob Ackermann
130ea42a79 Merge pull request #2924 from overleaf/jpa-bump-translations
[misc] bump translations

GitOrigin-RevId: c66b69d3f5a64d02ac2f88a936aa04c6e10c56f9
2020-06-24 02:10:48 +00:00
Jakob Ackermann
5d9740408a Merge pull request #2923 from overleaf/jpa-sentry-in-staging
[misc] sentry: allow reports for resources on the same origin and CDN

GitOrigin-RevId: 617939dccef839eb80df0b9d84e6684b5b2e618f
2020-06-24 02:10:43 +00:00
Jakob Ackermann
ae327e7fd0 Merge pull request #2922 from overleaf/jpa-fix-sentry-frontend
[misc] fix sentry integration for the frontend

GitOrigin-RevId: 269eb3c538e1dc891c4598b608b3392ee22320e0
2020-06-24 02:10:39 +00:00
Alasdair Smith
2e0db2a472 Merge pull request #2940 from overleaf/as-cleanup-no-undef-disables
Clean up disabling of no-undef eslint rule in frontend

GitOrigin-RevId: 3fb19256b7dd9d41626355960dd9fbcc541e663f
2020-06-24 02:10:34 +00:00
Alasdair Smith
0d2a768e1e Merge pull request #2937 from overleaf/as-remove-global-lodash
Replace global Lodash with explicit imports in frontend

GitOrigin-RevId: b092647039975ac594b69ce1fa145fd03552cc60
2020-06-24 02:10:29 +00:00
Alasdair Smith
5636386c54 Merge pull request #2944 from overleaf/as-clean-up-home-controller
Remove unnecessary check for SL homepage

GitOrigin-RevId: 3173ddd682458f36e11c77d8644500b8ce8af1cb
2020-06-24 02:10:23 +00:00
decaffeinate
92dede867f prettier: convert individual decaffeinated files to Prettier format 2020-06-23 18:30:51 +01:00
decaffeinate
bdfca5f155 decaffeinate: convert individual files to js 2020-06-23 18:30:48 +01:00
decaffeinate
42f55c4651 decaffeinate: rename individual coffee files to js files 2020-06-23 18:30:46 +01:00
decaffeinate
8a7fc78dc8 prettier: convert test/acceptance decaffeinated files to Prettier format 2020-06-23 18:30:45 +01:00
decaffeinate
db98fdac0a decaffeinate: rename test/acceptance/coffee to test/acceptance/js 2020-06-23 18:30:37 +01:00
decaffeinate
5443450abb decaffeinate: Run post-processing cleanups on ApplyUpdateTests.coffee and 18 other files 2020-06-23 18:30:34 +01:00
decaffeinate
d318e4fd0e decaffeinate: Convert ApplyUpdateTests.coffee and 18 other files to JS 2020-06-23 18:30:29 +01:00
decaffeinate
30a9c6ed2c decaffeinate: Rename ApplyUpdateTests.coffee and 18 other files from .coffee to .js 2020-06-23 18:30:23 +01:00