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
Jessica Lawshe
f0e9a37c7a
Merge pull request #2982 from overleaf/jel-no-cta-emails-cleanup
...
Tidy "No CTA" emails and update footer color in all emails
GitOrigin-RevId: bf4d88400a6165b4b2ba3880374921dcda9a2cef
2020-07-17 02:07:30 +00:00
Miguel Serrano
d7ff985554
Merge pull request #3018 from overleaf/jpa-retry-webpack-build
...
[misc] work around flaky webpack builds: retry once before failing
GitOrigin-RevId: 3247c2ae8f185e269b17f64c3b5d42cf16f96a5c
2020-07-17 02:07:24 +00:00
Miguel Serrano
244709df5e
Merge pull request #2988 from overleaf/msm-oerror-remove-not-found-error
...
Replace HTTPErrors.NotFoundError with calls to notFound() handler
GitOrigin-RevId: c98582a5bd3d862b3c17fb03d863c75f64851aba
2020-07-17 02:07:18 +00:00
Miguel Serrano
63503f2079
Merge pull request #2984 from overleaf/msm-oerror-remove-bad-request-error
...
Replace HTTPErrors.BadRequestError with calls to badRequest() handler
GitOrigin-RevId: 57a91a13bde942ee373e235ee925f1c76a0f4e88
2020-07-17 02:07:12 +00:00
Paulo Jorge Reis
4b90b09365
Merge pull request #2987 from overleaf/ta-outline-tracking
...
Add Event Tracking to Outline
GitOrigin-RevId: 239430ef0ff6ff67bf7c90291969cd28efde0d4a
2020-07-17 02:07:06 +00:00
Paulo Jorge Reis
e0dd4d0cf5
Merge pull request #3019 from overleaf/pr-fix-outline-jump-to-location
...
Fix outline "jump to location" feature.
GitOrigin-RevId: a760a885b997424bf677313636ac16588776b76a
2020-07-17 02:07:00 +00:00
Paulo Jorge Reis
ffc5c4be8f
Merge pull request #3009 from overleaf/jpa-fix-flaky-locking-in-tests
...
[misc] ProjectStructureMongoLockTest: eventually restore locking timeout
GitOrigin-RevId: 6c139edb0f6e37775c459a50a71dd90802e366fc
2020-07-17 02:06:54 +00:00
Paulo Jorge Reis
3660a98fd3
Merge pull request #2979 from overleaf/ta-outline-parser-v2
...
Improve Outline Parser
GitOrigin-RevId: 1774ac1055efc8c2b899396e4f56b6993438daad
2020-07-17 02:06:48 +00:00
Paulo Jorge Reis
0e9771ac09
Merge pull request #3007 from overleaf/pr-file-outline-extras
...
File outline extras
GitOrigin-RevId: c35c4f35dce280c9f44c02b567df9734943d0cb0
2020-07-17 02:06:42 +00:00
Miguel Serrano
79b6f6e473
Merge pull request #2994 from overleaf/msm-add-user-projection-subscription-handler
...
Added projection to User.find() queries in SubscriptionHandler
GitOrigin-RevId: f74e3fcd2138306dc35b5c4d0da314046ab48e35
2020-07-17 02:06:36 +00:00
Miguel Serrano
5b40eca697
Merge pull request #2992 from overleaf/msm-add-user-projection-referal
...
Added projection to User.find() queries in Referal feature
GitOrigin-RevId: 4929bcd9c1b242b7e35cc2632bbd8da3f378cd1d
2020-07-17 02:06:31 +00:00
Miguel Serrano
e692802690
Merge pull request #2991 from overleaf/msm-add-user-projection-project-controller
...
Added projection to User.getById() in ProjectController
GitOrigin-RevId: 9233a897414e3cda0b8c91f0b50d4ac422e0ab30
2020-07-17 02:06:25 +00:00
Miguel Serrano
6562f3003d
Merge pull request #2985 from overleaf/msm-oerror-remove-unprocessable-entity-error
...
Replace UnprocessableEntityError with calls to unprocessableEntity() handler
GitOrigin-RevId: 4bba389c8cdf87a40137d49db571fa81aaac4239
2020-07-17 02:06:19 +00:00
Jakob Ackermann
397bd034c7
Merge pull request #3011 from overleaf/jpa-optionally-increase-mongo-timeout
...
[misc] optionally increase the mongo timeout
GitOrigin-RevId: f204b017cf3bbb195667739d714b99bfd8a7eaa1
2020-07-16 02:06:56 +00:00
Jakob Ackermann
53927bca95
[misc] move /user/activate into a module ( #2962 )
...
* [misc] move /user/activate into a module
Co-Authored-By: Nate Stemen <nate.stemen@overleaf.com>
* [misc] setup copybara for the new user-activate module
* [misc] move the /user/activate route behind a feature flag
...which is by default enabled.
Co-authored-by: Nate Stemen <nate.stemen@overleaf.com>
GitOrigin-RevId: 87fc5ae869a7e282ffdbeea0ff7b7c55b8b9b31b
2020-07-16 02:06:51 +00:00
Alasdair Smith
c660497859
Merge pull request #3008 from overleaf/as-sd-undelete-to-user
...
Add endpoint to allow undeleted project to be assigned to a user
GitOrigin-RevId: 884af4abfa19c82296f83e792319458909d23b3c
2020-07-16 02:06:46 +00:00
Jakob Ackermann
5846ebb367
Merge pull request #182 from overleaf/msm-fix-npe-community-edition
...
Fixed NPE when Settings.clsi is defined but Settings.clsi.docker is not
2020-07-15 11:01:08 +02:00
Jakob Ackermann
0f9d0d9790
Merge pull request #183 from overleaf/jpa-clsi-allowed-image-names
...
[misc] RequestParser: restrict imageName to an allow list and add tests
2020-07-15 10:58:36 +02:00
Jakob Ackermann
4489a080fd
Merge pull request #186 from overleaf/jpa-import-132
...
[LocalCommandRunner] run: block a double call of the callback
2020-07-15 10:57:46 +02:00
Jakob Ackermann
8277623ecc
Merge pull request #185 from overleaf/jpa-import-123
...
[ExampleDocumentTests] drop out in case of an error during compilation
2020-07-15 10:57:34 +02:00
Alasdair Smith
2556fded1e
Merge pull request #2998 from overleaf/as-beta-page-updates
...
Update beta program page to include feedback survey link
GitOrigin-RevId: 549cd2be01b8f64d952d0347c8c102d0d2efae24
2020-07-15 02:06:35 +00:00
Hugh O'Brien
d4d6e2c45d
Merge pull request #3002 from overleaf/hb-parse-bst-errors
...
Adds parser for bst file bibtex errors
GitOrigin-RevId: 6481b0ca7cf6ab4522827ed5c6161b84472ccc19
2020-07-15 02:06:30 +00:00
Hugh O'Brien
ad7af82c53
Merge pull request #3001 from overleaf/hb-fix-typo-email
...
Fix a typo in onboarding email
GitOrigin-RevId: 83ea41346d900ce678df02a02535050ae03a750a
2020-07-15 02:06:24 +00:00