Commit graph

21888 commits

Author SHA1 Message Date
James Allen
669cb0c085 Merge branch 'master' of github.com:sharelatex/real-time-sharelatex 2015-08-31 14:04:59 +01:00
James Allen
da28b0fc70 Use updated metrics with unlimited socket config 2015-08-31 14:04:54 +01:00
James Allen
738363a6de Set maxSockets to Infinity for all services 2015-08-31 14:02:03 +01:00
Henry Oswald
3c70acd560 added metrics into realtime around doc update manager 2015-08-29 08:26:16 +01:00
James Allen
d79793c34f Monitor get document times 2015-08-29 08:22:43 +01:00
James Allen
40704b486e Don't lock up on very long lined documents 2015-08-28 16:52:09 +01:00
Shane Kilkelly
4d60872782 Merge branch 'master' of github.com:sharelatex/filestore-sharelatex 2015-08-28 14:48:25 +01:00
Shane Kilkelly
959191ae50 Add an acceptance test for using range header when getting a file. 2015-08-28 14:20:14 +01:00
Shane Kilkelly
ed980a21e1 Test the FileHandler layer. 2015-08-28 13:50:40 +01:00
Shane Kilkelly
64f70eddbd Add cluster.js to .gitignore. 2015-08-28 13:38:54 +01:00
Shane Kilkelly
8a631e70f7 Refactor, and log when we have a 'range' header. 2015-08-28 12:16:41 +01:00
Shane Kilkelly
387e96ab67 Refactor to make _get_range testable. 2015-08-28 12:02:50 +01:00
Shane Kilkelly
97cdc243d3 Parse out the range header and set start and end properties on options. 2015-08-28 11:45:16 +01:00
Shane Kilkelly
b905d9fba1 Add range-parser dependency. 2015-08-28 11:44:47 +01:00
Shane Kilkelly
76506ed91e Pass start/end options down to the S3PersistorManager.
Test that those options cause a 'Range' header to be attached to the
request sent to S3.
2015-08-28 10:09:41 +01:00
Shane Kilkelly
d88736e3b5 Pass the start and end options down to fs.createReadStream, and test for same. 2015-08-27 16:12:11 +01:00
Shane Kilkelly
57aedefdd3 Begin work towards obeying 'Range' headers, thread the opts down to persistence layer. 2015-08-27 15:21:33 +01:00
Henrique Dias
efff026a79 handle easier propagation 2015-08-25 16:52:28 -03:00
Henrique Dias
f910e63e90 fix null case 2015-08-24 12:22:17 -03:00
Henrique Dias
fcbe4aa925 fix inS3 propagation 2015-08-24 12:19:19 -03:00
Henrique Dias
1ccba422c8 remove unused function 2015-08-24 10:55:27 -03:00
Henrique Dias
98ce03b2f2 replace docs collection to DocstoreHandler 2015-08-24 10:38:31 -03:00
Shane Kilkelly
0aaeb6671e Keep password reset token in session, and strip it from reset page url.
This fixes an issue where the reset token was leaked in the referrer header
when navigating away from the password reset page to an external site.

Now we get the token from the query string, store it in the session,
then redirect to the bare url of the password reset page, which then
uses the stored token to render the reset form.
2015-08-24 11:53:33 +01:00
Brian Gough
0215b12a5f log memory usage every minute 2015-08-20 17:03:58 +01:00
Henry Oswald
a53e3b80cf if blog or universities site is down don't crash, send 500 2015-08-20 16:55:16 +01:00
Shane Kilkelly
23bd5d317c A few extra cases which should not be treated as html. 2015-08-20 15:58:36 +01:00
Shane Kilkelly
ebf754904f More thorough tests for the FileStoreController when downloading .html files. 2015-08-20 15:56:56 +01:00
Shane Kilkelly
aab7a8713e Catch the case where filename is shorter than the extension length. 2015-08-20 15:56:30 +01:00
Shane Kilkelly
85c1704fc5 Test that content-type is set for mobile-safari user-agents. 2015-08-20 14:03:12 +01:00
Shane Kilkelly
ce248f56d7 Un-break FileStoreControllerTests by mocking out the req.get method. 2015-08-20 12:28:51 +01:00
Shane Kilkelly
2dd56d0b32 If we're sending a html file to mobile-safari, do so as plain text.
This prevents safari from trying to render the page,
which it does because it ignores the "Content-Disposition" header.
2015-08-20 12:02:43 +01:00
Shane Kilkelly
936b41ff2a Merge branch 'sk-unpublish-buttons' 2015-08-19 15:44:02 +01:00
Henry Oswald
038c5a33a2 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-08-19 12:00:58 +01:00
Henry Oswald
0e9ec00f85 added stubbed logger in document controller tests 2015-08-19 11:58:59 +01:00
Henry Oswald
63580f6a79 remove useClsi2 flag in project collection 2015-08-19 11:58:41 +01:00
Henry Oswald
a777fcc5a6 changed post to deactivate projects to set params via body rather than query params 2015-08-19 11:55:35 +01:00
Henry Oswald
50fc886c94 changed inactive to active as its more effienct query in mongo 2015-08-19 11:54:30 +01:00
Shane Kilkelly
18f75bba79 Generalize this style to all .btn elements under the .template-details-section 2015-08-19 09:59:01 +01:00
Henrique Dias
04ec45529f restore updates from S3 when exists
fix: avoid rearchiving
2015-08-18 17:11:19 -03:00
Brian Gough
bea9ee6b19 add gc to filestore 2015-08-18 15:36:07 +01:00
Shane Kilkelly
865372d13f Add some whitespace around buttons in template-details. 2015-08-18 14:45:44 +01:00
Shane Kilkelly
96619bde8c Move the template-browser code into the 'templates' module.
Now located to be located at `modules/templates/public/coffee/main/index.coffee`,
moved to complete a migration of template related code into the templates module.

Corresponding commit in sharelatex-web-modules:
625c556e42072d30f30d474aaef72deff24ca154
2015-08-18 14:21:35 +01:00
Henry Oswald
5dd33ea313 changed back to standard /archive /unarchive 2015-08-18 14:10:53 +01:00
Henry Oswald
5765b59e0c added /deactivate and /reactivate endpoints as web will call those
also fixed acceptence test
2015-08-18 13:31:26 +01:00
Brian Gough
af21e0aec6 add metrics for memory and gc 2015-08-18 12:31:35 +01:00
Brian Gough
f237f7c3cc remove bug in optional argument handling 2015-08-18 11:23:10 +01:00
Brian Gough
518dc17fdc upgrade to mongojs 1.3.0 (use mongodb-core driver)
also add garbage collection
2015-08-18 09:56:05 +01:00
Brian Gough
27c382416a fix whitespace 2015-08-17 15:19:13 +01:00
Brian Gough
e3e8d80466 remove non-working metrics from graphite 2015-08-17 15:19:07 +01:00
Brian Gough
d2af7b24a0 remove randomisation to avoid shutdown problems 2015-08-17 15:18:18 +01:00