Brian Gough
d3dff28bea
Merge remote-tracking branch 'origin/master' into heukirne-s3-archive
2015-09-15 15:19:43 +01:00
Henry Oswald
70611da833
added a null check to getRequestUserAndProject
2015-09-15 12:47:48 +01:00
Henry Oswald
5ffd76c670
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-09-14 15:36:08 +01:00
Henry Oswald
9a72667e91
added word count UI feature.
2015-09-14 15:28:19 +01:00
Shane Kilkelly
5e157bcd16
Fix a case where a null user would cause displayName to crash.
2015-09-14 12:27:27 +01:00
Shane Kilkelly
77ac6c1baf
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2015-09-14 12:08:11 +01:00
Shane Kilkelly
7bc9218b3c
Fix up a bunch of issues with the track-changes list view.
...
- not crash when a user is null
- fix alignment of user color square
- if first and last name are absent, display email instead
- truncate overly long display name with '...'
2015-09-14 12:08:05 +01:00
Brian Gough
092f98d3ad
suppress error in normal shutdown case
2015-09-12 11:07:54 +01:00
Henry Oswald
507e8d13a6
Merge pull request #200 from heukirne/wordcount
...
Wordcount hook
2015-09-11 16:22:15 +01:00
Shane Kilkelly
778f588741
Merge pull request #199 from sharelatex/sk-missing-users
...
When a user is null in track-changes UI, display them as "Anonymous".
2015-09-11 14:24:08 +01:00
Henrique Dias
3be0425b45
add unit tests for wordcount
2015-09-11 10:21:05 -03:00
Shane Kilkelly
cb8189deda
Merge pull request #7 from sharelatex/sk-missing-users
...
Handle missing users
2015-09-11 14:19:17 +01:00
Shane Kilkelly
39f528bcbc
Add a test to check that users are summarised properly even when a null user occurs earlier in the update list.
2015-09-11 14:12:01 +01:00
Shane Kilkelly
eab8b4b6c8
Null safe access of id property, needed as user can be null.
2015-09-11 14:07:06 +01:00
Henrique Dias
d228fd88ab
add worcount file param
2015-09-11 09:53:06 -03:00
Shane Kilkelly
0ad374556d
Add a comment for clarity.
2015-09-10 16:43:40 +01:00
Henrique Dias
77c2162872
add wordcount clsi handler
2015-09-10 12:41:48 -03:00
James Allen
662050b3f9
Only show services header if we have some services to render
2015-09-10 16:01:12 +01:00
Shane Kilkelly
97326308fa
Update the Acceptance tests to include a case where a user doesn't exist.
2015-09-10 15:40:43 +01:00
Shane Kilkelly
4a315a0474
When a user is null in track-changes UI, display them as "Anonymous".
2015-09-10 14:35:09 +01:00
Shane Kilkelly
8387383cb4
In _summarizeUpdates, allow null users through.
...
A null value represents a deleted or otherwise missing user record.
2015-09-10 14:32:47 +01:00
Shane Kilkelly
810bddb2cb
Log a message when the web api produces a 404 response.
2015-09-10 14:32:35 +01:00
Shane Kilkelly
575bdc62ec
Add a test for when the user can't be found.
2015-09-10 14:32:18 +01:00
Shane Kilkelly
0d450b4e33
Tighten up error handling.
2015-09-10 11:10:30 +01:00
Shane Kilkelly
fcfc595c35
Handle potential error before calling LocalFileWriter.writeStream.
2015-09-10 09:12:49 +01:00
Shane Kilkelly
522786d45e
Produce a null value, rather than crashing when the user info service returns 404.
2015-09-09 15:48:22 +01:00
Henry Oswald
d7d0a6d9b0
Merge pull request #33 from sharelatex/pr/28
...
wordcount
2015-09-09 14:03:20 +01:00
Henry Oswald
4ee50b7239
- fixed bug with texcount returning wrong data for nauty lines
...
- improved acceptence test for word count to use nauty lines
2015-09-09 13:52:45 +01:00
Henry Oswald
ec338f8c10
add -inc to word count
...
use -inc to word count included files
also moved private function to bottom
2015-09-09 12:47:08 +01:00
Henry Oswald
d44cfb8614
added test to check compile should continue on error downloading http
...
resource
also improved logging
2015-09-09 09:44:38 +01:00
Henry Oswald
4b3aa933a3
don't error if a http resource can not be download
...
try and continue, log the error but you might still be able to
compile. prevents issue with badly uploaded images in filstore
2015-09-08 21:58:27 +01:00
Henry Oswald
18d817ee0a
added some missing error handling
2015-09-08 16:33:45 +01:00
Henry Oswald
17b0d99a65
rework the archiveDocChangesWithLock function
...
make it a bit more readable for me, struggle to trust indentation
based calls in coffeescript
2015-09-08 16:26:01 +01:00
Henry Oswald
0b3ebcff06
remove if statments checking if s3 is a backend
...
if its not enable then it can crash. In prod it should always be there
or not used at all
2015-09-08 16:23:15 +01:00
Henrique Dias
d332665648
move texcount to docker
2015-09-08 10:19:46 -03:00
Henrique Dias
09032565e2
Merge remote-tracking branch 'upstream/master' into texcount
2015-09-08 09:13:04 -03:00
Shane Kilkelly
a6fff2d4e4
Check for a large response body, rather than exact match on the first few bytes.
2015-09-08 11:50:43 +01:00
James Allen
1c9f9274a9
Remove uneeded and now wrong Sentry error capturing
2015-09-08 11:48:39 +01:00
Shane Kilkelly
c6a81c94eb
Test the cacheWarm option for preview.
2015-09-08 11:47:43 +01:00
Shane Kilkelly
b8042ae771
Add an acceptance test that uses a pdf file.
2015-09-08 11:43:19 +01:00
Shane Kilkelly
297ad78b1e
Add an acceptance test to check the preview endpoint doesn't time out.
...
This endpoint needs a lot more testing.
2015-09-08 10:32:41 +01:00
Shane Kilkelly
da5a538095
Fix calls to PersistorManager.getFileStream which were missed in initial refactor.
...
This should fix a breakage in the template publishing workflow.
Ref: b70b837b7ba29b0631f3105ec1dd5f6cdebbd195
2015-09-08 09:23:08 +01:00
James Allen
25b9a9be19
Upgrade Ace to 'package 11.07.15'
...
This required a refactor of all code that listen to events changes since the API
has changed. See https://github.com/ajaxorg/ace/pull/1745 for more details.
2015-09-07 17:04:05 +01:00
Henry Oswald
9cfa4b3f84
Don't put docs which are already in s3 through archive job
...
This fixes the bug we saw with 'RangeError: Maximum call stack size exceeded'
if lots of docs are already in s3 cb() gets called synchronously multiple times quickly
which can cause the execption. I am not sure where the recursion is, maybe inside async.
doing setImmediate(cb) also fixes the issue as I beilve it gives the
process chance to clear the stack. Similar to process.nextTick
2015-09-07 14:11:02 +01:00
Henry Oswald
ae75b855b4
added failing test for trying to archive load of docs which are already
...
in s3
2015-09-07 14:06:20 +01:00
James Allen
5fdb50958e
Fix logs dropdown to work with Angular 1.3
2015-09-03 13:13:28 +01:00
James Allen
95db287fef
Fix more dropdown menu in project list for new Angular
2015-09-03 13:02:43 +01:00
James Allen
c64891a61b
Fix folder dropdown to work with new Angular
2015-09-03 12:54:11 +01:00
James Allen
aa06eb55b7
Merge branch 'master' into angular_1.3.15
2015-09-03 12:52:08 +01:00
Henrique Dias
c5a8a249c6
add unarchive acceptance tests
2015-09-03 08:36:32 -03:00
