Commit graph

19237 commits

Author SHA1 Message Date
Brian Gough
f914c75712 highlights working for moving to position in pdf from source 2014-11-28 11:57:23 +00:00
James Allen
793763f206 Merge pull request #120 from watercrossing/POSTFix
Declare forms to use method="POST" explicitly
2014-11-28 11:11:18 +00:00
Brian Gough
ea310f0248 highlights/dblclick in pdfng - work in progress 2014-11-27 16:58:38 +00:00
Henry Oswald
20a5ad6e27 fixed where project to large code is passed from 2014-11-27 16:22:39 +00:00
Henry Oswald
c119d2ba79 err != error 2014-11-27 16:19:01 +00:00
Henry Oswald
d498076ab3 Merge branch 'master' of https://github.com/sharelatex/clsi-sharelatex 2014-11-27 16:11:11 +00:00
Henry Oswald
b8335b6b64 respect the status code on the error if it exists 2014-11-27 16:11:00 +00:00
Henry Oswald
fa755c6521 added project to long check from clsi2 (bit of a punt) 2014-11-27 15:42:37 +00:00
Brian Gough
3694bea956 use margin for height/width in pdfng 2014-11-27 14:16:32 +00:00
Henry Oswald
ca851589c9 Merge branch 'master' of https://github.com/sharelatex/filestore-sharelatex
Conflicts:
	package.json
2014-11-27 13:49:16 +00:00
Henry Oswald
dee7799fd4 added heapdump and endpoint to make dump 2014-11-27 13:48:39 +00:00
Brian Gough
b8377bca7b fix offset calculation to match pdflistview 2014-11-27 13:46:22 +00:00
Brian Gough
7b4ca6501b update the margin size of pdfng 2014-11-27 13:42:05 +00:00
Brian Gough
21e5fb08cd replicate the pdflistview classes in pdfng viewer 2014-11-27 13:41:48 +00:00
Henry Oswald
0bc76b6d92 mkdir p changed so it does not get entire project, now without doc lines 2014-11-27 12:07:49 +00:00
Henry Oswald
63deb0a508 Revert "added lock to update merger"
This reverts commit 8cdac1d74fd63d6ef83ce1e60ba41b9195ed0cac.
2014-11-27 11:46:17 +00:00
James Allen
9d97d1dc53 Handle templates locally ok 2014-11-27 11:08:29 +00:00
Henry Oswald
280895bdf5 added lock to update merger 2014-11-27 10:46:52 +00:00
Henry Oswald
ca8a21c425 change async to series
no real gain from parallel, series might reduce the cpu load if it finds the doc early
2014-11-26 21:53:57 +00:00
Henry Oswald
5e570d52a0 modfied setRootDocAutomatically to work async
was causing cpu to block for along time on big projects
2014-11-26 17:19:21 +00:00
Brian Gough
a15ee57d77 working on zoom/fit buttons 2014-11-26 16:52:54 +00:00
Brian Gough
6c1cee1431 save pdf position and scale 2014-11-26 16:18:59 +00:00
Brian Gough
7b66802bf5 set up pdf viewer app in base 2014-11-26 16:18:39 +00:00
Brian Gough
d0fb34b2aa Merge branch 'master' into pdfng 2014-11-26 15:42:42 +00:00
Henry Oswald
393a637673 remove a couple of required coffee-scritps which are not required 2014-11-26 15:37:53 +00:00
Henry Oswald
857d867191 added locks into editor controller for new/move/deletes
filesystem import manager uses the unlocked version
2014-11-26 15:32:23 +00:00
Brian Gough
33d94af930 Merge branch 'master' into pdfng 2014-11-26 14:17:02 +00:00
Henry Oswald
bd841b4795 coppied the lock manager over from doc updater 2014-11-25 16:52:27 +00:00
Brian Gough
643bda6095 add pdfng module and use it by default 2014-11-25 16:49:09 +00:00
Brian Gough
81b8594944 upgrade pdf.js to v1.0.712 2014-11-25 15:58:01 +00:00
Henry Oswald
ba784c3e62 changed swiss franks to show Fr for display issues 2014-11-25 13:18:57 +00:00
Henry Oswald
d070c0acd8 fixed SGD collab price 2014-11-25 13:14:38 +00:00
Henry Oswald
3bae278c92 Revert "increased timeout for geoip to 3 seconds"
This reverts commit e4c892b59734a0b6b67ad37a1d09c1618ec389d4.
2014-11-25 13:10:00 +00:00
Henry Oswald
d91064a369 increased timeout for geoip to 3 seconds 2014-11-25 11:51:03 +00:00
Henry Oswald
dbecadcaea Merge branch 'master' into multicurrency 2014-11-25 11:35:59 +00:00
Henry Oswald
dd37436da2 delete old cookie keys 2014-11-25 11:35:46 +00:00
James Allen
99ac814c7d Truncate error stack traces to 10 lines 2014-11-25 09:17:26 +00:00
Henry Oswald
02ef07dca4 broken free trial func into own file. added ab test on upgrade button colour 2014-11-24 23:59:55 +00:00
James Allen
7a9f7f0870 Don't print massive stack trace when there is no room_id 2014-11-24 22:28:50 +00:00
James Allen
d08f2dec97 Merge pull request #229 from sharelatex/force-npm-rebuild
force an npm rebuild to work around issue #129, missing bcrypt bindings
2014-11-24 16:29:00 +00:00
Henry Oswald
6c0f03e9c7 added ab test to show collar plan to people in editor 2014-11-24 16:21:03 +00:00
Brian Gough
a0e43f5559 force an npm rebuild to work around issue #129, missing bcrypt bindings file
see https://github.com/npm/npm/issues/5400
2014-11-24 16:13:31 +00:00
James Allen
d62dc7ca3a Don't be so verbose with client update errors 2014-11-24 15:42:26 +00:00
James Allen
43a008c0bc Stub logger in unit tests 2014-11-24 15:42:13 +00:00
James Allen
afca9ba0cb Fix unit tests 2014-11-24 14:26:51 +00:00
James Allen
b8fdbdb406 Handle errors in request pipes 2014-11-24 13:58:41 +00:00
James Allen
970125b7a8 Check for null project in joinProject 2014-11-24 13:43:08 +00:00
James Allen
3578e41c9c Add null check into FileTypeManager isDirectory check 2014-11-24 13:39:07 +00:00
James Allen
d4af0fe36d Wrap smoke test in domain to catch errors 2014-11-24 13:36:10 +00:00
James Allen
c28e09076b Add missing logger include in smoke test 2014-11-24 13:33:03 +00:00