Commit graph

17888 commits

Author SHA1 Message Date
Christopher Hoskin
57ef07dc67 lint and format 2020-07-30 15:08:22 +01:00
Christopher Hoskin
8376cf1ca2 Get acceptance tests working 2020-07-30 15:06:32 +01:00
Christopher Hoskin
6917847b10 catch 2020-07-30 14:45:49 +01:00
Christopher Hoskin
74e2a5eaa1 WIP 2020-07-30 13:53:48 +01:00
Shane Kilkelly
39c7cd3cd5 Merge pull request #172 from overleaf/sk-upgrade-redis
Upgrade redis-sharelatex to 1.0.13
2020-07-30 11:23:54 +01:00
Shane Kilkelly
fc389af7d6 Merge pull request #139 from overleaf/sk-update-redis
Upgrade to redis-sharelatex 1.0.13
2020-07-30 10:56:40 +01:00
Shane Kilkelly
802691a951 Merge pull request #89 from overleaf/sk-upgrade-redis
Upgrade redis-sharelatex to 1.0.13
2020-07-29 09:38:51 +01:00
Shane Kilkelly
abe3653286 Upgrade redis-sharelatex to 1.0.13 2020-07-28 09:25:30 +01:00
Jessica Lawshe
fa9c72c202 Merge pull request #3058 from overleaf/jel-feature-zotero
Verify features exist before checking for Zotero feature

GitOrigin-RevId: 9f1afddb6fb59d50f13b8ac7772fe93ae5d0ba04
2020-07-28 02:06:53 +00:00
Jessica Lawshe
305f82459f Merge pull request #3040 from overleaf/jel-email-added-alert
Secondary email added alert

GitOrigin-RevId: 6bfe8eb54110a522281b32490b0107db8890ab64
2020-07-28 02:06:48 +00:00
Jessica Lawshe
cbe21d1f77 Merge pull request #3024 from overleaf/jel-log-cleared-sessions
Log cleared user sessions in user.auditLog

GitOrigin-RevId: 829c4ea037d897689c02c1dfe12d38542a7216c0
2020-07-28 02:06:43 +00:00
Chrystal Maria Griffiths
e7107b7a8e Merge pull request #3057 from overleaf/cmg-wfh-export-updates
Export deletedSubscriptions not subscriptions for WFH 2020

GitOrigin-RevId: 4f9c37da27240c616d185076ab14daa1438de375
2020-07-28 02:06:37 +00:00
Jakob Ackermann
1f6499b5ea Merge pull request #3053 from overleaf/jpa-spd-accepts
[misc] reland 3004: unify detection of json requests and skip issuing of redirects

GitOrigin-RevId: fa43b3b4d23deb581496ed70ae8f28b805555d64
2020-07-28 02:06:27 +00:00
Jakob Ackermann
7847209eaa Merge pull request #3049 from overleaf/jlm-fix-referral-projection
Fix referral projection

GitOrigin-RevId: 37c68bf6bfa81a694e2f919b262634a9a1b63f8b
2020-07-28 02:06:20 +00:00
Chrystal Maria Griffiths
064ecda24f Merge pull request #3050 from overleaf/cmg-wfh-export
Logging updates to WFH export script

GitOrigin-RevId: ac6b9f92fcabe62a591d22c4efdb161da2758473
2020-07-25 02:06:54 +00:00
Chrystal Maria Griffiths
a4f4617b03 Merge pull request #3048 from overleaf/cmg-wfh-export
Export user details from WFH 2020 subscriptions

GitOrigin-RevId: 4f9be9d2b6309f7766f2855b571b81fc40870081
2020-07-25 02:06:48 +00:00
Jakob Ackermann
d1b8d49355 Merge pull request #3045 from overleaf/ns-delete-cannot-import-pug
remove unused "cannot import project" pug file

GitOrigin-RevId: b2f685af1c91d5eadcce2b4b46f362862356e109
2020-07-25 02:06:43 +00:00
Jakob Ackermann
9d8e20d3d8 Merge pull request #3043 from overleaf/hb-increase-timeout-on-onboarding-email
Increase timeout on user onboarding email endpoint

GitOrigin-RevId: d7c9aaae407e31ae2e9cfea5a6dce853c2737ab9
2020-07-25 02:06:37 +00:00
Jakob Ackermann
d5472b8743 Merge pull request #3038 from overleaf/jpa-cmg-hide-chat-container
[frontend] hide container for the chat component for token-access users

GitOrigin-RevId: f181d72bdffbc84485d796dac7c0f7edfcf6729a
2020-07-25 02:06:31 +00:00
Jakob Ackermann
35d64a1fba Merge pull request #3020 from overleaf/jpa-harden-copying-of-makefiles
[misc] make: harden parallel copying of the Makefile.module

GitOrigin-RevId: 2612516ebf1e33022233ad19741e5c7cda014483
2020-07-25 02:06:25 +00:00
Jakob Ackermann
023f1c254f Merge pull request #3000 from overleaf/jpa-skip-requests-for-anonymous-users
[misc] skip requests for anonymous users

GitOrigin-RevId: a459fc623c171ccc146ee0d31e8faca0b719d096
2020-07-25 02:06:18 +00:00
Christopher Hoskin
1ca6269aa5 Bump version to 2.2.0 2020-07-24 12:18:33 +01:00
Christopher Hoskin
d42bd2da50 Tidy up 2020-07-24 12:17:31 +01:00
Christopher Hoskin
6bc0d15d78 LOG_LEVEL_SOURCE env taking values file, gce_metadata or none, default file 2020-07-24 11:59:23 +01:00
Simon Detheridge
268f436461 Don't call AsyncPool with an empty array 2020-07-24 11:51:18 +01:00
Simon Detheridge
fdefb311ab Fix sha1 package hashes 2020-07-24 11:50:53 +01:00
Shane Kilkelly
f331c89da5 Fix integrity hash on coffee-script dependency 2020-07-24 11:14:20 +01:00
Shane Kilkelly
3d92858939 Upgrade redis-sharelatex to 1.0.13 2020-07-24 10:42:46 +01:00
Shane Kilkelly
2ef5f471ab Upgrade to redis-sharelatex 1.0.13 2020-07-24 10:14:48 +01:00
Christopher Hoskin
0a15fedb34 Remove debug logs 2020-07-24 09:12:59 +01:00
Christopher Hoskin
02356c7f27 All logging manager tests working 2020-07-24 09:12:59 +01:00
Christopher Hoskin
6961f41488 Promisfy log level checks 2020-07-24 09:12:59 +01:00
Christopher Hoskin
6b8dd86a26 WIP 2020-07-24 09:12:59 +01:00
Christopher Hoskin
14bac39222 Add MOCHA_GREP for testing 2020-07-24 09:12:59 +01:00
Christopher Hoskin
40a08bebdb WIP 2020-07-24 09:12:59 +01:00
Christopher Hoskin
50d2856841 Re-instate metadata request as fallback for CLSI 2020-07-24 09:12:59 +01:00
Christopher Hoskin
7630128857 Merge pull request #22 from overleaf/dependabot/npm_and_yarn/lodash-4.17.19
Bump lodash from 4.17.15 to 4.17.19
2020-07-24 09:09:25 +01:00
Paulo Jorge Reis
307e9345bb Merge pull request #3028 from overleaf/ta-outline-beta
Outline in Beta

GitOrigin-RevId: 351372bb35f2719ad26a6e7c8725a6f777472d88
2020-07-24 02:06:31 +00:00
Paulo Jorge Reis
f3ad611090 Merge pull request #3041 from overleaf/pr-more-outline-polish
More outline polish

GitOrigin-RevId: 6bb69e7af0d62f2107fc9b57c621e0dcb46d0a8d
2020-07-24 02:06:24 +00:00
Simon Detheridge
04ae868fe2 Update unit tests for object-persistor 2020-07-23 19:43:51 +01:00
Simon Detheridge
e302c1d844 Update acceptance tests for object-persistor and gcs 2020-07-23 19:43:33 +01:00
Simon Detheridge
6e04db552a Implement object-persistor support 2020-07-23 19:42:49 +01:00
Simon Detheridge
812c996c47 Add required settings for object-persistor 2020-07-23 19:42:20 +01:00
Simon Detheridge
287d705671 Update buildscripts to use fake-gcs instead of S3 credentials 2020-07-23 19:30:13 +01:00
Simon Detheridge
99a3266105 Add object-persistor module and upgrade deps to latest minor release 2020-07-23 19:29:25 +01:00
Simon Detheridge
de81ab2f70 Merge pull request #129 from overleaf/spd-remove-gcs-module
Move @google-cloud/storage to a dev dependency
2020-07-23 14:13:43 +01:00
Simon Detheridge
7e44dc7ba3 Merge pull request #128 from overleaf/spd-app-name-env
Use METRICS_APP_NAME env var to initialise metrics, if present
2020-07-23 14:13:16 +01:00
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