Commit graph

17912 commits

Author SHA1 Message Date
Christopher Hoskin
fbfd6a3205 Merge pull request #3089 from overleaf/csh-issue-3406-use-overleaf-copybara-web-private-key
Use overleaf copybara web private key

GitOrigin-RevId: 206ee2ccab3f08ae1e7059fa510f2b152e9f1a8f
2020-08-12 02:06:47 +00:00
Christopher Hoskin
f49bc2974d Merge pull request #23 from overleaf/csh-metadata-fallback-node-fetch
Support file and GCE metadata as log level sources
2020-08-11 11:39:56 +01:00
Christopher Hoskin
8ad8df0160 Merge branch 'csh-metadata-fallback-node-fetch' of github.com:overleaf/logger-module into csh-metadata-fallback-node-fetch 2020-08-11 11:00:41 +01:00
Christopher Hoskin
a66708a319 Ignore error 2020-08-11 10:56:51 +01:00
Christopher Hoskin
8649277c9f Format:fix 2020-08-11 10:55:03 +01:00
Christopher Hoskin
ea502a0623 Put LoggingManager.initialize back as it was in tests 2020-08-11 10:52:53 +01:00
Christopher Hoskin
20f2e1eb1d Don't catch checkLogLevel 2020-08-11 10:48:44 +01:00
Christopher Hoskin
9b21292b44 Ensure fetchResponse.text is a string in sinon stub 2020-08-11 10:47:31 +01:00
Simon Detheridge
0c83e19863 Merge pull request #63 from overleaf/spd-object-persistor
Add support for object-persistor
2020-08-11 10:44:25 +01:00
Christopher Hoskin
5e9dca7ddf Ensure fetchResponse.text is a string in sinon stub 2020-08-11 09:53:29 +01:00
Christopher Hoskin
46b22b30c7 Fix test description 2020-08-11 09:46:52 +01:00
Christopher Hoskin
3a2ff4e7b5 Merge branch 'master' into csh-metadata-fallback-node-fetch 2020-08-11 09:44:28 +01:00
Jakob Ackermann
7b64820484 [misc] add back environment variables for gcs buckets 2020-08-10 18:01:52 +01:00
Jakob Ackermann
05d2712eb1 [misc] bump the dev-env to 3.3.2 2020-08-10 17:23:17 +01:00
Jakob Ackermann
c722a79e93 [misc] bump the dev-env to 3.3.2 2020-08-10 17:23:15 +01:00
Jakob Ackermann
370baa06c3 [misc] bump the dev-env to 3.3.2 2020-08-10 17:10:31 +01:00
Jakob Ackermann
e92b1fa063 [misc] bump the dev-env to 3.3.2 2020-08-10 17:10:30 +01:00
Jakob Ackermann
7f19fa6081 [misc] bump the dev-env to 3.3.2 2020-08-10 17:01:12 +01:00
Jakob Ackermann
f0551307d2 [misc] bump the dev-env to 3.3.2 2020-08-10 17:01:12 +01:00
Jakob Ackermann
56abdff05a [misc] bump the dev-env to 3.3.2 2020-08-10 17:01:11 +01:00
Jakob Ackermann
1d1b9ebebc [misc] bump the dev-env to 3.3.2 2020-08-10 17:01:11 +01:00
Jakob Ackermann
e992166680 [misc] bump the dev-env to 3.3.2 2020-08-10 17:01:11 +01:00
Jessica Lawshe
31546c7de8 Merge pull request #3084 from overleaf/jel-admin-user-audit-log
Add user audit log tab to user admin page

GitOrigin-RevId: 7d5439a87d41897847f535c0e8a89bedea36f2d7
2020-08-10 15:56:25 +00:00
Jessica Lawshe
6dbf37d408 Merge pull request #3066 from overleaf/jel-log-admin-adds-email
Update user audit log when an admin adds email

GitOrigin-RevId: 758199e2f0f3501701b42bf359ce5ccd52cb3da0
2020-08-10 15:56:18 +00:00
Jessica Lawshe
7eee20f914 Merge pull request #3079 from overleaf/jel-log-password-update
Update audit log when password updated

GitOrigin-RevId: 3228e39e8a3682d6e77264cd6ee580f3fc40642a
2020-08-10 15:56:11 +00:00
Jessica Lawshe
197cf5e577 Merge pull request #3081 from overleaf/jpa-npmc-via-dev-env
[misc] drop the npmrc from the git-tree -- the dev-env will handle it

GitOrigin-RevId: 096b7f8d9c88e54eff6972feaaf205b32940c54d
2020-08-10 15:56:04 +00:00
Shane Kilkelly
3790dd5863 Merge pull request #3086 from overleaf/sk-double-fix-v2-template-style
Re-add max-width rule to gallery preview images

GitOrigin-RevId: 8335d3185075ed4049931c29c37cfa8bbb42ee53
2020-08-10 15:55:57 +00:00
Shane Kilkelly
6b5b933f8d Merge pull request #3069 from overleaf/sk-fix-template-styles
V2-Templates: Change css, "templates" -> "gallery"
GitOrigin-RevId: 9b4231f30b26f2b233685fa6ed13e27c225a3cf9
2020-08-10 15:55:50 +00:00
Henry Oswald
321a4c1f8a Merge pull request #3085 from overleaf/ho-mongo-4.0
bump mongo to 4.0.19 to see if tests pass on ci

GitOrigin-RevId: 70fa2ed6c33c4fa0f996fb975935b71e643fa1c7
2020-08-10 15:55:43 +00:00
Paulo Jorge Reis
414f7397fa Merge pull request #3073 from overleaf/pr-highlight-styling-and-beta
New highlight styling + highlight in beta

GitOrigin-RevId: e5d308bd725b4a1cfc4f0e564af05663ac4188dc
2020-08-10 15:55:37 +00:00
Paulo Jorge Reis
4e3a9d4fa8 Merge pull request #3070 from overleaf/ta-outline-scroll-fixes
Outline Scroll Fixes

GitOrigin-RevId: 14bff01ab7678d363884bd8525ad3f7e60acacb4
2020-08-10 15:55:30 +00:00
Chrystal Maria Griffiths
0538ea2069 Merge pull request #3042 from overleaf/cmg-bump-angular-1.8.0
Bump angular from 1.6.10 to 1.8.0

GitOrigin-RevId: 45146fd37e20b950172a2bd8df99d9fc8baefff1
2020-08-10 15:55:23 +00:00
Jakob Ackermann
439f80a3f8 Merge pull request #3068 from overleaf/jpa-block-npm-i-outside-docker
[misc] block local, outside docker invocations of 'npm install'

GitOrigin-RevId: 283eaaa0e7fe40c61dc4bdf820b50c767486a9ef
2020-08-10 15:55:16 +00:00
Jakob Ackermann
a3a26134fd Merge pull request #3052 from overleaf/ta-lint-no-q
Silence npm run Output

GitOrigin-RevId: 62b8deed0ecc2d2d116a9d4d254f5c306f5c8702
2020-08-10 15:55:09 +00:00
Jakob Ackermann
a437eb3d59 Merge pull request #2995 from overleaf/jpa-project-download-fix-leaking-upstream-response
[misc] project download: fix leaking upstream stream from error in pipe

GitOrigin-RevId: cb7db90890853352dc69ea2e46cec7e7ea66e6e9
2020-08-10 15:55:00 +00:00
Jessica Lawshe
33365e56bc Merge pull request #3061 from overleaf/jel-security-alert-clear-sessions
Send security alert email when sessions are cleared

GitOrigin-RevId: d1620214e84211edb69d7419ed64cf7618d1b460
2020-08-10 15:54:51 +00:00
Jessica Lawshe
c3450e4414 Merge pull request #3051 from overleaf/jel-log-when-email-added
Add entry to auditLog when user adds an email

GitOrigin-RevId: 797c85e18cb2b201e09fd2631b1e5ea066adfc37
2020-08-10 15:54:42 +00:00
Shane Kilkelly
c8e7ea91db Merge pull request #3047 from overleaf/sk-upgrade-redis
Upgrade to redis-sharelatex v1.0.13

GitOrigin-RevId: c4ac85a631adfb7d0d4e20e4c6c57e63a02e4c90
2020-08-10 15:54:35 +00:00
Shane Kilkelly
86655aa4e6 Merge pull request #3065 from overleaf/sk-sp-fix-toggle-bar
Show blank toolbar when rich-text is missing

GitOrigin-RevId: 86033df701b7a7af76400397cc895c66143a2cbe
2020-08-10 15:54:28 +00:00
Shane Kilkelly
b982493e08 Merge pull request #3032 from overleaf/msm-added-user-find-projections-scripts
Deleted scripts no longer needed

GitOrigin-RevId: 822aef0dbea7f2e7f664cb939ed75c9c658c00f5
2020-08-10 15:54:22 +00:00
Ersun Warncke
88683e9fec refactor SAMLController to use async throughout
GitOrigin-RevId: dafd76042f460cd34596c8c9023e2378145105e8
2020-08-10 15:54:15 +00:00
Timothée Alby
558854f51b Merge pull request #3030 from overleaf/ta-outline-highlight
Outline Highlight

GitOrigin-RevId: f51eec6f1714403d749e454b55be363819930b98
2020-08-10 15:54:08 +00:00
Timothée Alby
52fafa96c5 Merge pull request #3060 from overleaf/cmg-wfh-export-updates
WFH Export: Account for user being undefined

GitOrigin-RevId: 8e653fda6eaea3cdde8e5677f24ef39c1c97bb94
2020-08-10 15:54:00 +00:00
Timothée Alby
21de9041fe Merge pull request #3059 from overleaf/jpa-fix-user-activate-rendering
[misc] user-activate: fix the path of the parent pug-template

GitOrigin-RevId: f740bf42b092cdb4cecc211ae569044a090e9ca1
2020-08-10 15:53:53 +00:00
Timothée Alby
948cddd293 Merge pull request #3054 from overleaf/ta-lint-warnings
Fail Lint on Warnings

GitOrigin-RevId: 385d5842c5318a8d5b6dc016ec3d304e2a85deb4
2020-08-10 15:53:47 +00:00
Simon Detheridge
d5214d4351 Update object-persistor module 2020-08-10 16:53:18 +01:00
Simon Detheridge
c1f6554f1c Merge pull request #8 from overleaf/spd-default-opts
Add default parameter for 'opts' in MigrationPersistor.getObjectStream
2020-08-10 16:51:41 +01:00
Simon Detheridge
1115e1a1e6 Add default parameter for 'opts' in MigrationPersistor.getObjectStream 2020-08-10 16:44:37 +01:00
Simon Detheridge
1575cd41eb Don't pass empty array to asyncPool when archiving 2020-08-10 15:44:41 +01:00
Simon Detheridge
e4d7c253c0 Fallback to AWS_BUCKET env var in settings for backwards compatiblity 2020-08-10 11:55:39 +01:00