Commit graph

17789 commits

Author SHA1 Message Date
Simon Detheridge
e1868e2b54 Log request on error 2019-07-31 15:07:28 +01:00
Timothée Alby
befa4e932e Merge pull request #2027 from overleaf/ta-build-main-recurly-2
add main-recurly.js to Gruntfile

GitOrigin-RevId: 5527f97394efe6ca3d8c206276c46993547c8edc
2019-07-31 10:48:57 +00:00
Timothée Alby
8fb6835f8a Merge pull request #2026 from overleaf/ta-build-main-recurly
Add build steps for main-recurly.js

GitOrigin-RevId: 25231c62854b75904b1b5288b3a5157e10220f9d
2019-07-31 09:49:07 +00:00
Timothée Alby
ef9b487a60 Merge pull request #2019 from overleaf/jel-remove-oauth-migration
Remove unused OAuth link/unlink migration

GitOrigin-RevId: 20fce5a714f5897a1b5a93a65156f5368f2d1c65
2019-07-31 08:33:37 +00:00
Timothée Alby
b9ab0edf69 Merge pull request #2015 from overleaf/ta-recurly-upgrade
Upgrade Recurly

GitOrigin-RevId: 9a7c4804d2fafa31ea634498359dbfd95416b2ae
2019-07-31 08:33:31 +00:00
Timothée Alby
018b2cc474 Merge pull request #2010 from overleaf/ta-http-errors
Add More Http Errors

GitOrigin-RevId: d7aab42e1c7cec8757d6f2c6fc839a6c3f204351
2019-07-31 08:33:25 +00:00
Simon Detheridge
d9d9ee9541 Merge pull request #2023 from overleaf/spd-fix-deleted-project-expiry
Fix not-found error when cleaning up deleted projects

GitOrigin-RevId: db3d0f8756319dbeb7ff753a8603cf61b9fb8a0c
2019-07-30 08:40:37 +00:00
Brian Gough
2c0c3dc573 Merge pull request #77 from overleaf/bg-use-individual-channels
support per-doc pubsub channels
2019-07-30 09:35:38 +01:00
John Lees-Miller
f0d59bc192 Bump lodash version 2019-07-30 09:34:49 +01:00
Brian Gough
e197d58103 Merge pull request #2003 from overleaf/bg-use-individual-channels
support individual pubsub channels

GitOrigin-RevId: e750eeb1945ddcf2c92d0d1878363f14da208984
2019-07-30 07:33:36 +00:00
Timothée Alby
12575c5481 Merge pull request #6 from overleaf/ta-http-errors
Add common HTTP errors
2019-07-29 18:25:55 +02:00
Tim Alby
9229c9b3a9 add common HTTP errors 2019-07-29 18:25:31 +02:00
nate stemen
49ac91efe6 Merge pull request #2006 from overleaf/ns-project-import-dash-improvements
project import dash improvements

GitOrigin-RevId: 4e8ce6bdef7d22acff1746981a513ae1ef7a4539
2019-07-29 14:56:14 +00:00
Brian Gough
478a727c61 ignore spurious requests to leave other docs 2019-07-29 15:19:08 +01:00
Brian Gough
1926f97dbf Merge pull request #67 from overleaf/bg-fix-join-leave
fix async behaviour of join/leave
2019-07-29 12:13:58 +01:00
Brian Gough
04a171171f fix async behaviour of join/leave 2019-07-29 11:54:02 +01:00
mserranom
d29ea9f527 Fixed WEB_HOST lookup in settings 2019-07-29 10:28:27 +00:00
Hugh O'Brien
a638f9e567 Merge pull request #1976 from overleaf/hb-v1-history-metadata-from-mongo
Fetch history metadata for v1 users

GitOrigin-RevId: a65971dbef2be02c17ff07b1bf22c0f7b15c1780
2019-07-29 09:58:35 +00:00
Simon Detheridge
cf22393dff Merge pull request #2018 from overleaf/spd-handle-undefined-in-deletedproject
Handle 'undefined' values when creating DeletedProject objects

GitOrigin-RevId: 1d34d3b44feb50fd5501b1c35f06f62c0170b861
2019-07-26 15:41:37 +00:00
Simon Detheridge
2243f42f9b Merge pull request #1996 from overleaf/spd-soft-deletion-admin-panel-improvements
Improve display of soft-deleted things in admin panel

GitOrigin-RevId: 8413103fb750749bb27c69ccb6ff34c4ef62d402
2019-07-26 14:39:24 +00:00
Simon Detheridge
d7bee9a7d8 Merge pull request #2014 from overleaf/spd-deleted-project-collab-ids
Store and backfill collaborator and overleaf history IDs in deleted projects

GitOrigin-RevId: 34950e29d6910c22f1f6f153f8035a96a1ea8360
2019-07-26 14:39:18 +00:00
Simon Detheridge
285edfff36 Merge pull request #1994 from overleaf/ta-missing-stub
Add missing EmailHandler stub

GitOrigin-RevId: d497807068623e1338a95d2dfa02c56726ca39d1
2019-07-25 15:20:51 +00:00
Brian Gough
624cf5589f Merge pull request #65 from overleaf/bg-use-per-room-channels
listen on separate channels for each project/doc
2019-07-25 13:41:55 +01:00
Simon Detheridge
3b3e9e79fa Merge pull request #2007 from overleaf/bg-enable-doc-hash-checking-for-all-users
enable doc hash checking for all users

GitOrigin-RevId: 9f26580bf21791669361cc84ca2fa561b1bb3f50
2019-07-25 11:14:09 +00:00
Simon Detheridge
5c82ef80b6 Merge pull request #34 from overleaf/spd-unlearn
Add endpoint to remove learned words
2019-07-25 12:04:39 +01:00
mserranom
cf0df28f4c Patched EventEmitter for socket.io compatibility with Node >= 7 2019-07-25 09:22:24 +00:00
Brian Gough
618880f99d remove unnecessary check for doc_id 2019-07-24 16:57:43 +01:00
Brian Gough
22d722f3e8 add metric for RoomEvents listeners 2019-07-24 16:25:45 +01:00
Brian Gough
277ec71a5b subscribe to doc updates before requesting doc content 2019-07-24 15:49:29 +01:00
Brian Gough
1c74cbbc4e add comments 2019-07-24 15:49:29 +01:00
Brian Gough
273af3f3aa refactor subscribe resolution 2019-07-24 14:30:48 +01:00
Brian Gough
e14a94906a update naming from Set -> Map 2019-07-24 14:18:15 +01:00
Brian Gough
cb53bfafd6 remove unnecessary require 2019-07-24 09:52:31 +01:00
Brian Gough
61b3a000b4 fix whitespace 2019-07-24 09:52:20 +01:00
Jessica Lawshe
90b1c4a23c Merge pull request #1995 from overleaf/ta-conversion-metrics-query-fix
Pass conversion metrics query params to v1

GitOrigin-RevId: 0f6cb0118ac92896590fbe26b24a6b2a723e1f2c
2019-07-24 08:21:32 +00:00
Brian Gough
159b39c491 ensure redis channel is subscribed when joining room 2019-07-23 17:02:09 +01:00
mserranom
3dbced021d fixed install-services and split install and compilation 2019-07-23 12:56:49 +00:00
mserranom
3c791751c1 updated node version 2019-07-23 12:56:25 +00:00
Ersun Warncke
d9b5941642 do not use v1 for setting default email
GitOrigin-RevId: 00d4610ae55c0a90699d4bc79e7d08d432087abe
2019-07-23 10:59:58 +00:00
Jessica Lawshe
0a2a32120f Use v2 data for OAuth providers
GitOrigin-RevId: 09df3253c283b3196bc48a0440e9ea5f1eb20c9c
2019-07-23 10:59:53 +00:00
Simon Detheridge
6f40fd9b99 Merge pull request #1993 from overleaf/ta-module-test-bootstrap
load tests bootstrap when running module-only unit tests

GitOrigin-RevId: 26abca1b2d4da313a7bf83c8618f9255aaac2ca0
2019-07-22 15:31:36 +00:00
Simon Detheridge
e4c3ebdbdc Merge pull request #2000 from overleaf/spd-dont-log-project-list
Don't log the project list when rendering the project dashboard

GitOrigin-RevId: 472a3d519d4ad75b524776ab6369122c2099fbe7
2019-07-22 15:31:30 +00:00
Simon Detheridge
4cf480a448 Merge pull request #1965 from overleaf/jel-remove-v1-login
Remove login to v1 via v2

GitOrigin-RevId: e5ba86786d14c5a2be87aff6b38cfd807b5cd053
2019-07-22 15:31:24 +00:00
Brian Gough
84e6ff616f whitespace fix 2019-07-22 12:25:41 +01:00
Brian Gough
c9ccf62d71 support per-doc pubsub channels 2019-07-22 12:20:06 +01:00
Simon Detheridge
00d09fd6f5 Return 204 instead of 200 when [un]learning words
Also remove unnecessary calls to `next()`
2019-07-22 12:15:07 +01:00
Simon Detheridge
7105ee58d3 Cleanup decaffienation in LearnedWordsManagerTests 2019-07-22 12:14:30 +01:00
Brian Gough
bb629c27a1 rename unit test ChannelManager to ChannelManagerTests 2019-07-22 11:28:49 +01:00
Brian Gough
1afebd12a1 unit tests 2019-07-22 11:23:43 +01:00
Brian Gough
92e6910180 cleanup 2019-07-22 11:23:33 +01:00