github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-23 02:55:13 -04:00
Code Issues Projects Releases Packages Wiki Activity
17794 commits 3 branches 7 tags 188 MiB
Commit graph

17794 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
48e4f32745 Add migration to enable trackChanges for all users 2017-05-17 14:23:55 +01:00
James Allen
e10d09d040 Merge pull request #22 from sharelatex/ja-archive-ranges 
Archive ranges as well as doc lines
 2017-05-17 12:02:42 +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
4622362e42 Merge pull request #39 from sharelatex/bg-lock-exponential-backoff 
exponential backoff for lock up to maximum time
 2017-05-16 17:01:43 +01:00
Brian Gough
dff6e2c3da bug fix in backoff 2017-05-16 16:31:28 +01:00
Paulo Jorge Reis
9e4869ee3d Merge pull request #506 from sharelatex/pr-prepare-bulk-actions-events 
Prepare bulk actions events
 2017-05-16 15:51:19 +01:00
Brian Gough
c7d8fbbb8a exponential backoff for lock up to maximum time 2017-05-16 15:22:02 +01:00
Paulo Reis
7f3c0ed5ac Refactor accept and reject methods to support multiple changes; support bulk actions events. 2017-05-16 14:27:06 +01:00
James Allen
c6d9df95f3 Merge pull request #38 from sharelatex/ja-redis-cluster 
Migrate lock to be redis-cluster compatible
 2017-05-16 14:16:43 +01:00
Paulo Reis
36b4a8e6c2 Update ranges tracker. 2017-05-16 14:04:13 +01:00
Paulo Reis
ac99422c26 Update ranges tracker. 2017-05-16 14:04:06 +01:00
Paulo Reis
a3c529d23f Update range tracker with new bulk method. 2017-05-16 14:03:52 +01:00
Shane Kilkelly
25e0a19350 Make confirm-password routes more restful 2017-05-16 11:51:06 +01:00
James Allen
db824d9730 Merge pull request #14 from sharelatex/ja-dont-return-blank-clients 
Don't return a user if there is no entry
 2017-05-16 11:14:54 +01:00
James Allen
642134da79 Don't return a user if there is no entry 
ioredis returns a blank object, {}, if there is no key with hgetall.
Previously, node-redis returned nil. So we need to check for a blank
object as well as a nil object.
 2017-05-16 11:06:05 +01:00
James Allen
9d2bdcf8da Merge pull request #505 from sharelatex/ja-redis-cluster-refactor 
Allow writing of clsi cookie cache to redis cluster secondary
 2017-05-16 10:17:30 +01:00
Shane Kilkelly
ada614cc69 Check response exists before calling method 2017-05-16 09:20:12 +01:00
Brian Gough
0e0f4c34f0 Merge pull request #41 from sharelatex/revert-38-bg-load-doc-safely-in-lock 
Revert "fail safely if doc cannot be loaded"
 2017-05-15 16:19:10 +01:00
Brian Gough
b15d2ef796 Revert "fail safely if doc cannot be loaded" 2017-05-15 16:18:40 +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
Shane Kilkelly
707a81cc2a Correct title of confirm-password page 2017-05-15 15:46:11 +01:00
James Allen
5aa8b71832 Allow writing of clsi cookie cache to redis cluster secondary 2017-05-15 15:35:01 +01:00
Paulo Jorge Reis
2c3f0aa6b4 Merge pull request #34 from sharelatex/pr-bulk-actions 
Add methods to bulk accept changes.
 2017-05-15 15:14:33 +01:00
Brian Gough
0908e36fb7 fix unit tests 2017-05-15 13:46:01 +01:00
Shane Kilkelly
1d7d0193fc Use translations for sudo-mode prompt 2017-05-15 13:37:54 +01:00
Shane Kilkelly
1f7724be68 Merge branch 'sk-sudo-mode' of github.com:sharelatex/web-sharelatex into sk-sudo-mode 2017-05-15 11:54:14 +01:00
Shane Kilkelly
c864288c4e On logout, clear sudo mode 2017-05-15 11:53:52 +01:00
Brian Gough
f7a33528da Merge pull request #38 from sharelatex/bg-load-doc-safely-in-lock 
fail safely if doc cannot be loaded
 2017-05-15 11:46:24 +01:00
James Allen
17b064df18 Adjust style of sudo mode prompt 2017-05-15 11:45:41 +01:00
Paulo Reis
f4e46bb2f9 Use new ranges tracker method to get N changes at once; small refactor. 2017-05-15 11:24:40 +01:00
Paulo Reis
7bb5d65b52 Update ranges tracker. 2017-05-15 11:11:28 +01:00
Paulo Reis
ef7fa59257 Update ranges tracker. 2017-05-15 11:11:14 +01:00
Shane Kilkelly
0f75d9f4d9 Test SudoModeController 2017-05-15 10:56:43 +01:00
Paulo Reis
05d7d1b8c6 Merge branch 'master' into pr-bulk-actions 2017-05-15 10:35:16 +01:00
James Allen
fb6e028182 Migrate lock to be redis-cluster compatible 2017-05-15 10:34:24 +01:00
Paulo Reis
82a19444b3 Merge branch 'master' into pr-bulk-actions 2017-05-15 10:29:15 +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
Paulo Reis
dd85c2fab2 Remove debug line. 2017-05-12 15:44:49 +01:00
Paulo Reis
36d16a76e0 Unit test accept changes in the ranges manager. 2017-05-12 14:42:40 +01:00
Brian Gough
2ee40d0748 ensure document is in redis before consuming ops 2017-05-12 14:22:18 +01:00
Brian Gough
be96548199 log number of updates for future debugging 2017-05-12 14:07:59 +01:00
James Allen
5cd5b7e110 Merge pull request #13 from sharelatex/ja-remove-multi-call 
Remove multi call to make compatible with redis-cluster
 2017-05-12 13:58:07 +01:00
Paulo Jorge Reis
d550ede112 Merge pull request #496 from sharelatex/pr-review-panel-relayout 
Review panel relayout
 2017-05-12 13:54:59 +01:00
Brian Gough
d4a8d88750 put a limit on the number of ops per iteration 2017-05-12 13:15:59 +01:00
Shane Kilkelly
1640dfa79a Merge branch 'sk-fix-cooldown-tpds' 2017-05-12 09:11:23 +01:00