Commit graph

22110 commits

Author SHA1 Message Date
Brian Gough
a550078071 replace verbose logging by slow query log 2017-05-18 15:04:12 +01:00
Brian Gough
95596061d4 clarify calculation of process.hrtime 2017-05-18 15:02:54 +01:00
Brian Gough
e00f4dde8e log profilers start and end times for reference 2017-05-18 15:02:44 +01:00
Brian Gough
e11f64f83a increase profiling cutoff to 1s 2017-05-18 15:02:08 +01:00
Paulo Jorge Reis
04585c59be Merge pull request #498 from sharelatex/pr-bulk-actions
Bulk actions
2017-05-18 14:40:44 +01:00
Paulo Reis
e532f543a3 Merge branch 'master' into pr-bulk-actions 2017-05-18 14:38:16 +01:00
Shane Kilkelly
d5fa1401a1 Ensure bcrypt gets installed 2017-05-18 13:08:55 +01:00
Brian Gough
b6efb051e1 add profiling 2017-05-18 11:17:08 +01:00
Brian Gough
387ecac6cb log for each get/try/release lock 2017-05-18 11:17:08 +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
Paulo Reis
832764dd3d Add key shortcut to toggle the review panel. 2017-05-18 11:02:50 +01:00
Paulo Reis
7c26628ce0 Improve styling. 2017-05-18 11:02:31 +01:00
Shane Kilkelly
b52028c7bb Add realtime config and websessions to redis 2017-05-18 10:55:41 +01:00
Paulo Reis
5a9519d18f Add a toggler element inside the review panel. 2017-05-17 16:41:53 +01:00
Shane Kilkelly
f7a2d60c44 Update redis configs to accomodate recent changes 2017-05-17 15:29:01 +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
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