Paulo Reis
|
b0b75e2ebb
|
Update docupdaterhandler tests.
|
2017-05-18 15:04:12 +01:00 |
|
James Allen
|
39ca6d1e6c
|
Merge pull request #508 from sharelatex/ja-fix-clsi-cookie-cluster
Check for blank string in clsi cookie caching
|
2017-05-18 11:12:11 +01:00 |
|
James Allen
|
f708a0cd81
|
Check for blank string in clsi cookie caching
ioredis returns "" for a blank entry, the previous driver returned null,
so also check for a blank string
|
2017-05-18 11:09:33 +01:00 |
|
Brian Gough
|
5237647b8b
|
Merge pull request #489 from sharelatex/bg-improve-upload-robustness
improve stream error handling on upload
|
2017-05-17 15:26:03 +01:00 |
|
Shane Kilkelly
|
6338835baf
|
Merge branch 'sk-sudo-mode'
|
2017-05-17 09:48:22 +01:00 |
|
Shane Kilkelly
|
4e3284cec8
|
Merge branch 'sk-dont-redirect-to-images'
|
2017-05-17 09:48:16 +01:00 |
|
Brian Gough
|
e23871118d
|
Merge remote-tracking branch 'origin/master' into bg-improve-upload-robustness
|
2017-05-15 16:01:01 +01:00 |
|
Shane Kilkelly
|
60d3e4a97b
|
If external auth system is in use, skip sudo-mode checks
|
2017-05-15 15:46:24 +01:00 |
|
James Allen
|
5aa8b71832
|
Allow writing of clsi cookie cache to redis cluster secondary
|
2017-05-15 15:35:01 +01:00 |
|
Brian Gough
|
0908e36fb7
|
fix unit tests
|
2017-05-15 13:46:01 +01:00 |
|
Shane Kilkelly
|
c864288c4e
|
On logout, clear sudo mode
|
2017-05-15 11:53:52 +01:00 |
|
Shane Kilkelly
|
0f75d9f4d9
|
Test SudoModeController
|
2017-05-15 10:56:43 +01:00 |
|
Shane Kilkelly
|
76285a1554
|
Start testing SudoModeController
|
2017-05-15 10:07:22 +01:00 |
|
Shane Kilkelly
|
8605dc83b4
|
Merge branch 'master' into sk-sudo-mode
|
2017-05-15 09:21:13 +01:00 |
|
Shane Kilkelly
|
0e26222551
|
Don't redirect to images, icons, etc, in login workflow
|
2017-05-12 15:46:16 +01:00 |
|
Shane Kilkelly
|
1640dfa79a
|
Merge branch 'sk-fix-cooldown-tpds'
|
2017-05-12 09:11:23 +01:00 |
|
James Allen
|
3bfd92dd9c
|
Rename lock to avoid potential conflict with doc updater
|
2017-05-11 15:27:01 +01:00 |
|
Shane Kilkelly
|
7b0aca7f02
|
add cooldown to tpds mergeUpdate path
|
2017-05-11 11:29:57 +01:00 |
|
Shane Kilkelly
|
e6286c721d
|
Merge branch 'master' into sk-fix-large-projects
|
2017-05-11 08:40:17 +01:00 |
|
Shane Kilkelly
|
08567ff220
|
if projectId is not defined, error out
|
2017-05-10 15:25:23 +01:00 |
|
Shane Kilkelly
|
27842996aa
|
start testing SudoModoController
|
2017-05-10 15:15:57 +01:00 |
|
Shane Kilkelly
|
4d662f23de
|
test SudoModeMiddlewear
|
2017-05-10 14:54:49 +01:00 |
|
James Allen
|
274d6f4ac6
|
Merge pull request #493 from sharelatex/ja-redis-cluster-refactor
Move all redis end points to be cluster compatible
|
2017-05-10 14:38:37 +01:00 |
|
Shane Kilkelly
|
993c261b10
|
start testing sudo-mode
|
2017-05-10 11:37:32 +01:00 |
|
Shane Kilkelly
|
149e38855f
|
Add a cooldown mechanism for projects which go over limits
|
2017-05-09 11:40:42 +01:00 |
|
James Allen
|
8449b0417c
|
Move all redis end points to be cluster compatible
|
2017-05-04 15:22:54 +01:00 |
|
Brian Gough
|
46f693519a
|
return 404 for api request on missing doc
|
2017-04-27 16:41:53 +01:00 |
|
Shane Kilkelly
|
a9b8b864df
|
Move content-disposition setting into a method on res
|
2017-04-12 16:00:02 +01:00 |
|
Shane Kilkelly
|
02d75deaa0
|
when setting content-disposition, uri-encode names
|
2017-04-12 09:31:59 +01:00 |
|
Shane Kilkelly
|
bb65da88fe
|
Merge branch 'master' into node-6.9
|
2017-04-05 10:15:51 +01:00 |
|
Shane Kilkelly
|
043520fc28
|
Remove the Metrics module, use metrics-sharelatex
|
2017-04-03 16:18:30 +01:00 |
|
Shane Kilkelly
|
49de7bf315
|
mock out metrics in test
|
2017-03-31 14:54:20 +01:00 |
|
Shane Kilkelly
|
bee62400a6
|
Merge branch 'master' into sk-upgrade-metrics
|
2017-03-31 14:08:12 +01:00 |
|
James Allen
|
3bf19a38ee
|
Merge pull request #467 from sharelatex/ja-validate-recurly-subscription-on-creation
Handle a 404 from Recurly if account doesn't exist
|
2017-03-28 16:06:25 +01:00 |
|
James Allen
|
08699d7aa2
|
Handle a 404 from Recurly if account doesn't exist
|
2017-03-28 15:46:58 +01:00 |
|
James Allen
|
f53234271f
|
Merge pull request #465 from sharelatex/sk-hide-email-errors
If sending email fails, return a generic error.
|
2017-03-28 13:16:43 +01:00 |
|
James Allen
|
2e6e51eb6d
|
Merge pull request #464 from sharelatex/ja-validate-recurly-subscription-on-creation
Check Recurly for subscription as well before creating subscription
|
2017-03-28 13:15:58 +01:00 |
|
Brian Gough
|
835d8d618d
|
use error handler
|
2017-03-28 11:33:37 +01:00 |
|
Brian Gough
|
f433510e61
|
return NotFound error in ProjectDetailsHandler
|
2017-03-28 10:12:52 +01:00 |
|
Brian Gough
|
4e66b045e3
|
fix unhandled exception in ProjectDetailsHandler
|
2017-03-28 09:44:50 +01:00 |
|
Shane Kilkelly
|
d2e1efe4a9
|
fix a daft mistake
|
2017-03-27 17:45:19 +01:00 |
|
Shane Kilkelly
|
69b9b308d4
|
If sending email fails, return a generic error.
This prevents us from leaking juicy details of our aws/ses setup via the
password-reset form.
|
2017-03-27 16:17:38 +01:00 |
|
James Allen
|
7aa4c0c030
|
Check Recurly for subscription as well before creating subscription
|
2017-03-27 12:07:43 +01:00 |
|
Henry Oswald
|
e22da8e530
|
rename unit test
|
2017-03-27 09:57:15 +01:00 |
|
Henry Oswald
|
9c7465fd64
|
Merge pull request #461 from sharelatex/ho-annom-user-events
add identify on login
|
2017-03-27 09:28:34 +01:00 |
|
Henry Oswald
|
379efcb04a
|
Merge branch 'master' into ho-annom-user-events
|
2017-03-27 09:28:03 +01:00 |
|
Henry Oswald
|
cff922a0f5
|
idendify -> identify
|
2017-03-22 16:01:26 +00:00 |
|
Henry Oswald
|
ebdce6169e
|
idendifyUser on login
|
2017-03-22 15:50:49 +00:00 |
|
Henry Oswald
|
f910bb58de
|
add tests for AnalyticsController
|
2017-03-22 13:11:45 +00:00 |
|
Shane Kilkelly
|
a64f890ed0
|
Upgrade metrics api
|
2017-03-17 14:55:41 +00:00 |
|
Henry Oswald
|
625fa810c2
|
validate mongo id in getPrivilegeLevelForProject
https://sentry.io/sharelatex-1/sl-web-server-prod/issues/204397665/
|
2017-03-17 14:44:51 +00:00 |
|
Henry Oswald
|
8ee2e5ba63
|
null check folder in findElement
https://sentry.io/sharelatex-1/sl-web-server-prod/issues/236000085/
|
2017-03-17 13:29:20 +00:00 |
|
Henry Oswald
|
e5468983ce
|
clone project plow though null doc/file/folders
https://sentry.io/sharelatex-1/sl-web-server-prod/issues/227107799/
|
2017-03-17 13:21:30 +00:00 |
|
Henry Oswald
|
d453a4d5c7
|
null check stat when we check file on disk
https://sentry.io/sharelatex-1/sl-web-server-prod/issues/125814174/
|
2017-03-17 13:03:16 +00:00 |
|
Shane Kilkelly
|
5e112043ca
|
Fix unit tests for modules now using metrics.timeAsyncMethod
|
2017-03-16 11:08:17 +00:00 |
|
Shane Kilkelly
|
1ce48e971a
|
Merge branch 'sk-fix-file-upload'
|
2017-03-10 11:30:03 +00:00 |
|
Shane Kilkelly
|
ec25ee9045
|
When upload to filestore fails, produce an error
|
2017-03-09 10:11:45 +00:00 |
|
James Allen
|
b75d0ab3eb
|
Don't show onboarding for newly registered users
|
2017-03-09 09:13:49 +00:00 |
|
James Allen
|
2b36a443c9
|
Pull track changes backend into a module
|
2017-03-02 16:45:24 +00:00 |
|
Shane Kilkelly
|
9a641d43eb
|
Remove cruft
|
2017-02-27 14:00:45 +00:00 |
|
Shane Kilkelly
|
98d7dc6f88
|
Make work on both 0.10 and 6.9
|
2017-02-27 13:54:57 +00:00 |
|
James Allen
|
c8096facfb
|
Merge pull request #421 from sharelatex/ho-announcments
mark announcments before user signs up as read
|
2017-02-14 15:12:10 +01:00 |
|
Henry Oswald
|
27caf4d555
|
mark announcments before user signs up as read
|
2017-02-14 12:29:48 +00:00 |
|
James Allen
|
03ecf4b4ae
|
Only show track changes onboarding once based on analytics API events
|
2017-02-14 10:25:46 +01:00 |
|
Shane Kilkelly
|
7d5dc34b3e
|
fix the set-password form for new (admin-created) users
|
2017-02-06 14:58:54 +00:00 |
|
James Allen
|
b086d7afa2
|
Refactor rate limiting code around sending invites
|
2017-01-27 16:26:58 +01:00 |
|
James Allen
|
757c7002eb
|
Merge pull request #397 from sharelatex/ja-modify-threads
Allow editing/deleting of comments and threads
|
2017-01-25 15:50:00 +01:00 |
|
Shane Kilkelly
|
239164fe26
|
Merge branch 'master' into sk-rate-limit-cluster
|
2017-01-25 09:56:08 +00:00 |
|
Henry Oswald
|
cc717f0357
|
domainAnnouncementsToShow -> domainAnnouncements
|
2017-01-25 09:44:13 +00:00 |
|
Henry Oswald
|
02e6eb4dd1
|
Merge pull request #399 from sharelatex/ho-promote-case-study
promote domain alerts
|
2017-01-25 09:41:50 +00:00 |
|
Henry Oswald
|
1280a2313d
|
add check for id to exist in domain announcments
null check user at start of getUnreadAnnouncements
fix spelling mistake
|
2017-01-25 09:35:11 +00:00 |
|
Henry Oswald
|
13d21b881f
|
use new annoncments feature for case study info
|
2017-01-24 16:03:05 +00:00 |
|
James Allen
|
f9ba7392e9
|
Allow editing/deleting of comments and threads
|
2017-01-24 16:21:14 +01:00 |
|
Shane Kilkelly
|
a148eb1f43
|
Merge branch 'master' into sk-rate-limit-cluster
|
2017-01-24 09:24:47 +00:00 |
|
Henry Oswald
|
6d35585847
|
limit number of invites each user can do
done with the number of collaborators a user can add
prevents notifications getting filled up as well
|
2017-01-21 12:43:15 +00:00 |
|
James Allen
|
3413687833
|
Merge pull request #393 from sharelatex/ja-track-changes
Ja track changes
|
2017-01-18 15:32:16 +01:00 |
|
Shane Kilkelly
|
1137ab0715
|
Don't record redirect to static asset paths
|
2017-01-17 14:35:37 +00:00 |
|
James Allen
|
9c0bf885be
|
Merge branch 'master' into ja-track-changes
|
2017-01-17 10:16:41 +01:00 |
|
Shane Kilkelly
|
82ddeab2bd
|
If user tries to invite themselves to project, don't.
|
2017-01-16 13:45:01 +00:00 |
|
Henry Oswald
|
fed88504f8
|
rate limit emails sent sharing projects by users
|
2017-01-14 14:52:32 +00:00 |
|
Shane Kilkelly
|
25956d4c62
|
Fix up tests
|
2017-01-13 16:04:26 +00:00 |
|
Shane Kilkelly
|
525e871d55
|
Merge branch 'master' into sk-rate-limit-cluster
|
2017-01-13 14:17:18 +00:00 |
|
James Allen
|
aab4dea8ae
|
Merge branch 'master' into ja-track-changes
|
2017-01-13 13:46:01 +01:00 |
|
Shane Kilkelly
|
f5ced03074
|
Set redirect when sending user to login page.
Allows smart redirecting to work when public access is turned off.
|
2017-01-10 15:42:36 +00:00 |
|
James Allen
|
d03aa7056e
|
Rename /ranges/users end point to /changes/users
|
2017-01-10 13:43:53 +01:00 |
|
James Allen
|
4e128b6ab7
|
Send user data in /threads dat
|
2017-01-09 17:25:06 +01:00 |
|
James Allen
|
9379cff89d
|
Add end point for accepting change in doc updater
|
2017-01-09 15:25:27 +01:00 |
|
James Allen
|
3a5d45fa32
|
Get user info via web, not chat
|
2017-01-06 13:41:58 +01:00 |
|
Shane Kilkelly
|
259c589076
|
Add option to restrict invites to existing user accounts.
|
2016-12-20 09:54:42 +00:00 |
|
Shane Kilkelly
|
822f76a883
|
Add unit tests for RedisWrapper
|
2016-12-19 15:12:22 +00:00 |
|
Shane Kilkelly
|
d428f9adbc
|
Make LoginRateLimiter a thin wrapper around RateLimiter
|
2016-12-19 14:10:51 +00:00 |
|
Shane Kilkelly
|
ef0a5801d5
|
Create a RedisWrapper, and use it for rate limiting.
|
2016-12-19 12:17:02 +00:00 |
|
James Allen
|
988005e929
|
Send and get comments via the chat api
|
2016-12-16 16:42:41 +00:00 |
|
James Allen
|
293ba1fc4c
|
Fetch all ranges from docstore when viewing overview panel
|
2016-12-09 15:43:08 +00:00 |
|
James Allen
|
1830d41eba
|
Proxy ranges between doc updater and docstore
|
2016-12-08 14:09:06 +00:00 |
|
Henry Oswald
|
e6eeb86046
|
add read property to announcments
|
2016-12-07 11:39:22 +00:00 |
|
Shane Kilkelly
|
58280bf6ee
|
Merge branch 'master' into sk-user-delete-with-cancelled-sub
|
2016-12-06 09:31:42 +00:00 |
|
James Allen
|
48cc5a992f
|
Merge branch 'master' into ja-set-version-in-docstore
|
2016-12-01 09:30:53 +00:00 |
|
Shane Kilkelly
|
e03d16e0cd
|
Deleting user: if subscription is already cancelled, ignore and proceed.
|
2016-11-30 16:03:18 +00:00 |
|
James Allen
|
eb648b9bc8
|
Proxy version number to and from docstore
|
2016-11-29 17:16:56 +00:00 |
|