Commit Graph

844 Commits

Author SHA1 Message Date
Shane Kilkelly ff4991284d Change docLabelsUpdated socket event to broadcastDocLabels 2017-06-12 13:06:56 +01:00
Shane Kilkelly 9f9468d0e0 Use lowercase project_id 2017-06-12 11:37:05 +01:00
Shane Kilkelly c9432a1238 Fix unit tests 2017-06-12 10:09:33 +01:00
Shane Kilkelly feb1d87de1 Add test for LablesHandler 2017-06-08 10:25:39 +01:00
Shane Kilkelly 3c4a6f06be Add unit tests for LabelsController 2017-06-08 09:22:26 +01:00
James Allen 76b8fecde9 Merge pull request #509 from sharelatex/ja-fix-clsi-cookie-cluster
Don't try to set the server id if it isn't returned in the response
2017-05-19 15:00:18 +01:00
James Allen 01548a0216 Don't try to set the server id if it isn't returned in the response 2017-05-19 10:23:01 +01:00
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
Shane Kilkelly 25e0a19350 Make confirm-password routes more restful 2017-05-16 11:51:06 +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 b09a41c557 Fix acceptance tests 2017-05-10 13:45:53 +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