github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-10-17 21:05:04 -04:00
Code Issues Projects Releases Packages Wiki Activity
22434 commits 3 branches 7 tags 201 MiB
Commit graph

19683 commits

Author SHA1 Message Date
James Allen
80c58bb718 Remove deprecated versioning code 2014-05-27 12:56:23 +01:00
James Allen
c1afbc66d9 Don't error if user is not logged in when compiling 2014-05-27 12:33:56 +01:00
James Allen
e529875245 Revert "Send content-length header when getting file" 
This reverts commit 6f5f7a98fd3ce53091aacc744f43c7704ba73461.
 2014-05-23 13:57:18 +01:00
James Allen
daf4f1ffd4 Send content-length header when getting file 2014-05-23 13:54:20 +01:00
James Allen
f8819fbbd7 Increase req and res stream timeouts to 3 minutes 2014-05-22 12:18:56 +01:00
Henry Oswald
a2f564df8b changed image preview to lowercase it so .PNG will preview 2014-05-21 17:44:30 +01:00
Henry Oswald
895bb55677 lowercase file extension when seeing preview 2014-05-21 17:34:57 +01:00
James Allen
8f41c6dcb2 Don't automatically clear the cache 2014-05-21 15:20:25 +01:00
Henry Oswald
10c012d856 removed tpdsworker 2014-05-21 12:28:31 +01:00
Henry Oswald
fd53cf0124 tell tpds sender to use pub url for docstore 2014-05-21 09:15:50 +01:00
James Allen
063f6c7680 Only auto clear CLSI cache on hard error, otherwise prompt user 2014-05-21 08:04:52 +01:00
Henry Oswald
ce0fb75224 removed grunt-nodemon from package.json as its not used atm 2014-05-20 13:34:04 +01:00
Henry Oswald
57eb0e2006 Revert "Revert "changed docstore url to /raw for tpds updates"" 
This reverts commit 4af4ff34b0ebad0ce9056a1c1dd5e20f12f6096d.
 2014-05-20 13:19:02 +01:00
Henry Oswald
ed9e25450a Revert "Revert "change send doc lines using tpds to work with stream and doc store"" 
This reverts commit a41299570d07b83111b6a995902a30a67867a5c7.
 2014-05-20 13:18:59 +01:00
Henry Oswald
973d9b8643 added raw endpoint to docstore 2014-05-20 13:04:33 +01:00
James Allen
93d418b716 Revert "change send doc lines using tpds to work with stream and doc store" 
This reverts commit ba37710b087b4919c01eed3d8cfeb9d61af43a4d.
 2014-05-20 11:14:06 +01:00
James Allen
22c577f9b5 Revert "changed docstore url to /raw for tpds updates" 
This reverts commit f9e60db892d270811c5e38f273d8a1b62b86eeb2.
 2014-05-20 11:13:57 +01:00
Henry Oswald
2398b34f28 changed docstore url to /raw for tpds updates 2014-05-20 08:32:39 +01:00
Henry Oswald
d32fe588b7 change send doc lines using tpds to work with stream and doc store 2014-05-19 20:32:48 +01:00
James Allen
9261987bd8 Increase size limit (arbitrarily... *shrug*) 2014-05-19 20:03:05 +01:00
James Allen
a45200dfe3 Automatically clear CLSI cache when compile fails 2014-05-19 16:10:52 +01:00
James Allen
7fed2155be Differentiate between timeouts, server errors, and LaTeX failures in client 2014-05-19 16:10:52 +01:00
James Allen
6c5a2c2740 Reconfigure internal CLSI call to understand more than just success/failure 2014-05-19 16:10:52 +01:00
Henry Oswald
a53d767eca changed 412 status code to 400 2014-05-19 14:02:54 +01:00
James Allen
5cd66aad58 Return more informative errors 2014-05-19 07:18:57 -04:00
Henry Oswald
de38cbf595 destroy session when getting project details 2014-05-19 12:01:05 +01:00
Henry Oswald
6f9969d6e1 log out after smoke tests 2014-05-19 11:53:10 +01:00
Henry Oswald
af2de3cdeb finished off change email 2014-05-19 11:50:32 +01:00
James Allen
de0d79e1bf Use configurable upload directory 2014-05-17 21:01:48 +01:00
Henry Oswald
7437115967 added controler t change user email 2014-05-16 17:45:48 +01:00
Henry Oswald
c4a420bd7f writen function to set the user email safely 2014-05-16 17:29:54 +01:00
James Allen
cc962e1c44 Add indexes in background 2014-05-16 17:00:30 +01:00
James Allen
6a371c267f Fix indexes 2014-05-16 16:41:40 +01:00
James Allen
29ad81c134 Use expiresAt rather than tempCreatedAt 2014-05-16 16:41:14 +01:00
James Allen
8b0b79bc32 Use TTL index to auto-delete updates after a week when versioning is not enabled 2014-05-16 15:59:12 +01:00
James Allen
7cca4f0368 Don't store and send version data 2014-05-16 13:06:35 +01:00
James Allen
a62bff5052 USe parallel limit on zip file streaming 2014-05-16 11:50:15 +01:00
Henry Oswald
28ae33b100 added login link to reset message 2014-05-16 11:34:28 +01:00
Henry Oswald
221c2214dd changed class from email to password on form 2014-05-16 11:30:44 +01:00
Henry Oswald
50df82697a Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-05-16 11:27:09 +01:00
James Allen
2104c69cb9 Stream files into zip in series 2014-05-16 11:26:58 +01:00
Henry Oswald
9419d3a0e5 hooked up the frount end ui to show the email can not be found, 
added client side valdidation on password, removed server side min
length check. Just check that it is not 0 len
 2014-05-16 11:26:29 +01:00
James Allen
e9c164dc73 Fix test that could never fail 2014-05-16 11:01:36 +01:00
James Allen
240dc2e319 Use crypto.randomBytes 2014-05-16 10:52:31 +01:00
Henry Oswald
9c3c57f2a8 renamed TokenGenerator to PasswordResetTokenHandler and added Expire to function name 2014-05-16 10:43:55 +01:00
Henry Oswald
bf1bb22afd added rate limiting to password reset endpoint 2014-05-16 10:31:33 +01:00
Henry Oswald
ca1539cac0 added timefreeze to recurly wrapper, don't think it really works but never know *double shurg* 2014-05-15 22:21:49 +01:00
Henry Oswald
133c4759f8 fix tests, whoops 2014-05-15 18:26:00 +01:00
Henry Oswald
e1b3f3542c added some logging 2014-05-15 18:14:05 +01:00
Henry Oswald
24c50189b6 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-05-15 18:01:49 +01:00
Henry Oswald
f7245f32d0 cleaned up old password reset cruft 2014-05-15 18:01:43 +01:00
Henry Oswald
96d98329f1 token based reset works 2014-05-15 17:58:25 +01:00
Henry Oswald
1ffd19099b writen getUserIdFromToken 2014-05-15 17:20:42 +01:00
Henry Oswald
9f901fb1ba added the token generator and its getNewToken function 2014-05-15 17:16:20 +01:00
Henry Oswald
64688e661d written password reset controller 2014-05-15 16:50:38 +01:00
James Allen
e72dd50089 Use configurable uploads folder location 2014-05-15 16:32:17 +01:00
James Allen
946f451155 Move to default settings file 2014-05-15 16:22:06 +01:00
Henry Oswald
551e1d465a written password reset handler 2014-05-15 16:20:23 +01:00
James Allen
93883c7a03 Fix calling of updateDoc 2014-05-15 15:43:04 +01:00
James Allen
f6e85c4140 Don't proxy version number to/from docstore 2014-05-15 12:44:08 +01:00
James Allen
ffd10a8439 Don't send or get versioning info to/from web 
The version number is only used by the doc updater and so can be cleanly
encapsulated in a collection that only the doc updater knows about. The version
is already stored under docOps, so continue to tore it there.
 2014-05-15 11:13:16 +01:00
James Allen
e25fb7e435 Keeping writing and reading updates from Mongo to cover the deploy period 2014-05-14 16:04:25 +01:00
Andreas Källberg
db89f8c8db Fixes #63, highlighting file names when renaming up to full stop 2014-05-14 16:40:51 +02:00
James Allen
bdfe018cad Log out warning when using Mongo for version still 2014-05-14 14:16:27 +01:00
James Allen
0199f2e129 Use version from web, with fallback to old mongo collection 2014-05-14 13:28:17 +01:00
James Allen
8973969224 Merge branch 'master' into remove_mongo_doc_ops 
Conflicts:
	app/coffee/DocOpsManager.coffee
	test/acceptance/coffee/ApplyingUpdatesToADocTests.coffee
	test/acceptance/coffee/FlushingDocsTests.coffee
	test/unit/coffee/DocOpsManager/DocOpsManagerTests.coffee
	test/unit/coffee/RedisManager/prependDocOpsTests.coffee
	test/unit/coffee/RedisManager/pushDocOpTests.coffee
 2014-05-14 12:39:40 +01:00
James Allen
79457227e1 Support up to 2mb requests 2014-05-13 12:54:58 +01:00
Henry Oswald
1f1f535c8b removed lines which may be causing issue with domain 2014-05-12 18:33:09 +01:00
Henry Oswald
ce67c8c655 added logging to err domain 2014-05-12 15:57:08 +01:00
Henry Oswald
3bbeff5aff moved all metrics to use the module, deleting old metrics file and added different check in err domain 2014-05-12 15:45:15 +01:00
James Allen
4a27342b01 Merge branch 'docstore_integration' 2014-05-12 14:23:41 +01:00
James Allen
3213c562bc Add in new metrics 2014-05-09 14:55:37 +01:00
James Allen
76f929f415 Add in new http monitoring 2014-05-09 13:30:35 +01:00
James Allen
c835528dea Add in metrics 2014-05-09 12:44:13 +01:00
James Allen
0bddc5552e Use docstore for updating documents 2014-05-08 15:47:50 +01:00
James Allen
0dda75c2d5 Pass through version and revision information 2014-05-08 15:43:08 +01:00
James Allen
8315de58c7 Proxy get doc requests to the docstore 2014-05-08 13:42:30 +01:00
Henry Oswald
9a81f85b41 added gauge metrics for number of open socket.io http and https 
connections
 2014-05-08 11:33:46 +01:00
Henry Oswald
a8571653db added timeouts to filestore handler 2014-05-08 10:55:44 +01:00
James Allen
6011ce4783 Use new metrics module 2014-05-08 09:28:13 +01:00
James Allen
0adcf3c140 Log out errors when null docs are encountered 2014-05-07 16:38:10 +01:00
James Allen
43ed71e82c Do a check for null docs 2014-05-07 16:24:47 +01:00
James Allen
b29e94b4d5 Use new metrics package 2014-05-07 15:29:04 +01:00
James Allen
c73b7fae69 Use docstore when creating a new doc 2014-05-07 14:31:46 +01:00
James Allen
ccbe33a82e Add in http monitoring 2014-05-07 10:59:16 +01:00
James Allen
f511ebd4b6 Exit cleanly on SIGINT et al 2014-05-07 10:05:07 +01:00
James Allen
d1434f7646 Increase redis lock expiry time to 30 seconds 2014-05-07 09:48:29 +01:00
Henry Oswald
09224007a7 on domain error wait 3 seconds to send 500 to allow for other cleanup. 
Also check inside function if the res has finished. #confused
 2014-05-07 09:06:05 +01:00
Henry Oswald
be8fdcfd6a added null check on send property of res 2014-05-07 08:23:44 +01:00
James Allen
aed4a7ce18 Add in metrics 2014-05-06 16:52:58 +01:00
James Allen
628fb65bc3 Work with ObjectId's passed to ProjectGetter 2014-05-06 13:34:37 +01:00
James Allen
2fb8b0e807 Get project without doc lines in getAllFolders 2014-05-06 13:15:18 +01:00
James Allen
6a2370b5be Use docstore for CLSI request building 2014-05-06 12:54:26 +01:00
James Allen
ca6be52fa0 Revert "Revert "Get doclines from docstore when cloning project"" 
This reverts commit ff79e4d2e659751ec88b3791566f3de24e6b67f4.
 2014-05-06 12:36:00 +01:00
James Allen
8af372aff3 Revert "Revert "Get doc lines from docstore when performing batch operations"" 
This reverts commit a700665650b5984fdb3afe5565d62ba810100ebe.
 2014-05-06 12:35:27 +01:00
James Allen
9be4feaae1 Revert "Get doc lines from docstore when performing batch operations" 
This reverts commit 9fab27158cb02b0268f8e6aec090f275f062d885.
 2014-05-01 17:19:21 +01:00
James Allen
fee632cfc9 Revert "Get doclines from docstore when cloning project" 
This reverts commit 9ab3f5b3fba8a1324c576bbdb9614f70f4c719aa.
 2014-05-01 17:19:09 +01:00
James Allen
24343a38cd Add error handling of mismatched versions back in 2014-05-01 10:26:01 +01:00
James Allen
82b56d0b4f Get doclines from docstore when cloning project 2014-04-30 16:45:53 +01:00
James Allen
465b5ca9db Get doc lines from docstore when performing batch operations 2014-04-30 15:49:07 +01:00
Henry Oswald
3b1cc6e500 removed metrics from http logging but added key in 
having the key in there means its easy to analyise the logs based on the
route
 2014-04-30 13:14:41 +01:00
James Allen
fa049ff4eb Add endpoint for getting all docs 2014-04-30 13:06:12 +01:00
James Allen
f3314437ab Create default settings file 2014-04-30 11:33:31 +01:00
James Allen
abbcea2945 Add commented out docker config 2014-04-30 11:31:37 +01:00
James Allen
d82ae02d23 Fix unit tests 2014-04-30 11:23:53 +01:00
James Allen
355a5a020e Keep reference to deleted docs and delete via docstore 2014-04-30 11:15:29 +01:00
James Allen
0c0548ea85 Don't crash when route path is a regex 2014-04-30 09:42:20 +01:00
James Allen
f8dec76464 Add DocstoreManager 2014-04-29 17:22:37 +01:00
James Allen
984999ec61 Add in HTTP end point for deleting docs 2014-04-29 16:36:10 +01:00
Henry Oswald
0b93a719f0 added statsd metrics timing for each request 2014-04-29 15:20:31 +01:00
James Allen
885d5de191 Add in DocManager.deleteDoc method 2014-04-29 15:07:22 +01:00
James Allen
9be5265f32 Update gruntfile with configurable report 2014-04-29 12:31:30 +01:00
Henry Oswald
2cdadf1a4b check for error when doing a password reset 2014-04-29 11:59:23 +01:00
James Allen
2e8582874f Add POST end point for updating doc lines 2014-04-29 11:49:09 +01:00
Henry Oswald
8cc055422c removed word project from the label on project actions button 2014-04-29 11:37:02 +01:00
Henry Oswald
7896a8b85c changed order of project list button menu 2014-04-29 11:11:20 +01:00
Henry Oswald
bf2c60f84d added rename project to list page 2014-04-28 17:47:47 +01:00
James Allen
94b25055fc Add in DocManager.updateDoc method 2014-04-28 17:43:19 +01:00
James Allen
22b13077b2 Add in grunt forever command 2014-04-28 16:53:51 +01:00
James Allen
4adfcc0e5e Create LICENSE 2014-04-28 16:50:47 +01:00
James Allen
f4e7b47b90 Create README.md 2014-04-28 16:50:23 +01:00
James Allen
f09444de3b Create .travis.yml 2014-04-28 16:48:36 +01:00
James Allen
6eb328e788 Create a GET endpoint for getting doc lines 2014-04-28 16:45:59 +01:00
Henry Oswald
3655e83ff9 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-04-28 16:27:19 +01:00
Henry Oswald
a0fb170878 updated archive module to latest version 2014-04-28 16:27:15 +01:00
James Allen
64ab1a4f59 Remove restore warning message 2014-04-28 12:54:16 +01:00
James Allen
d528ac21a3 Mark projects as archived, but don't actually delete them 2014-04-28 12:53:43 +01:00
Yimin
295b438498 fix typo 2014-04-22 04:21:42 -05:00
Henry Oswald
39b9c99735 fix unit tests I broke by adding timeout to tags 2014-04-16 17:51:40 +01:00
Henry Oswald
0a093b779e fixed #100, if tags is not running you should be able to delete a project still 2014-04-16 17:44:57 +01:00
Henry Oswald
8795a8a921 if retore url is not in mongo don't blow up 2014-04-15 14:19:20 +01:00
Henry Oswald
4b11790a54 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-04-15 13:59:04 +01:00
Henry Oswald
aca2e5639e added referal allocator to user controller 2014-04-15 13:59:00 +01:00
James Allen
eebfa6499e Be more forgiving with version mismatches 2014-04-15 08:02:49 +01:00
James Allen
c249ea91f9 Restore button doesn't work 2014-04-14 06:28:36 +01:00
James Allen
ea651ee9bd Add in restore page 2014-04-14 06:17:07 +01:00
James Allen
6aee795e67 Add project URL to message 2014-04-14 00:03:42 +01:00
James Allen
c750797ca4 Update message 2014-04-13 23:38:44 +01:00
Henry Oswald
c2cb6e2c1f updated wording again 2014-04-13 23:18:13 +01:00
Henry Oswald
255b932079 added message explainging potential data reverted 2014-04-13 22:59:41 +01:00
Henry Oswald
c23f9aa056 be able to get build templates from web as well as templates 2014-04-11 15:15:32 +01:00
Henry Oswald
dbe2dd3078 fix case problem with require of newsletter manager 2014-04-10 22:21:20 +01:00
Henry Oswald
51e69392a7 cleaned up and fixed problem with open user opening pojrect 2014-04-10 17:49:39 +01:00
Henry Oswald
9355632f30 deleted user controller. The end of /controllers 2014-04-10 17:29:46 +01:00
Henry Oswald
f7ea925e67 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-04-10 17:26:14 +01:00
Henry Oswald
5df01acfe1 moved reset password to new controler, not tests as it will be rewritten soon. Just want to kill off /controllers 2014-04-10 17:26:09 +01:00
Henry Oswald
5760e51d6e moved password change to new user controller with tests 2014-04-10 17:15:18 +01:00
Henry Oswald
cc68fe443f Moved register function into user registration handler and new user 
controller
 2014-04-10 16:32:47 +01:00
James Allen
573c877a57 Remove unneeded/broken stream.resume() 2014-04-10 12:57:49 +01:00
James Allen
049dcc2780 Split lines on Windows line endings too 2014-04-10 12:45:42 +01:00
James Allen
c2ebaaa338 Split lines on Windows line endings too 2014-04-10 12:44:46 +01:00
Henry Oswald
2ca7c344a3 reformtted reg handler tests 2014-04-10 12:39:13 +01:00
Henry Oswald
e4223c9b5e fixed test for logout 2014-04-09 17:07:19 +01:00
Henry Oswald
b6b30c3d37 moved logout to new user controller 2014-04-09 16:59:28 +01:00
Henry Oswald
b46576e91f Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-04-09 16:33:58 +01:00
Henry Oswald
bb7025ad6e moved user update user settings to user controller 2014-04-09 16:33:54 +01:00
James Allen
f931f5f5ce Only show if sidebar is open and meant to be shown 2014-04-09 15:57:55 +01:00
Henry Oswald
bcfc1bee0c moved unsubscribe endpoint to new user controller 2014-04-09 15:41:19 +01:00
James Allen
52b22a41c8 Use simpler exec command with a timeout 2014-04-09 15:34:54 +01:00
Henry Oswald
d611984948 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-04-09 15:26:13 +01:00
Henry Oswald
0d1421b7ee fix user deleter test 2014-04-09 15:26:07 +01:00
James Allen
81378f43c1 Make a few UI improvements to syncing 2014-04-09 15:24:37 +01:00
Henry Oswald
026ad8089d Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-04-09 15:04:51 +01:00
Henry Oswald
12773c26c2 moved user settings page to the user pages controller 2014-04-09 15:04:47 +01:00
Henry Oswald
823f4a5eb9 created new UserController and put delete user in it 2014-04-09 14:50:12 +01:00
Henry Oswald
37fb959b00 renamed UserController to UserInfoController 2014-04-09 14:45:46 +01:00
Henry Oswald
c55c5032b0 moved delete user to the user controller 2014-04-09 14:43:08 +01:00
James Allen
b53fed1243 Rearrange compile flags 2014-04-09 12:44:51 +01:00
James Allen
173e0a80c6 Compile binary with install 2014-04-09 12:37:04 +01:00
James Allen
79cb8270e5 Add in floating buttons for syncing between code and PDF 2014-04-09 12:35:33 +01:00
Henry Oswald
5f72f13528 moved password reset to user pages controller 2014-04-09 12:26:59 +01:00
Henry Oswald
434fca8874 moved login page to new user page controller 2014-04-09 12:22:57 +01:00
Henry Oswald
fa36891faf moved register page to new UserPagesController 2014-04-09 12:17:50 +01:00
Henry Oswald
c163bba1da populate users on a project in parallelLimit 2014-04-09 11:49:28 +01:00
Henry Oswald
47fb623c4b dont call enable versioning on join project 2014-04-09 11:45:57 +01:00
Henry Oswald
cba3644777 updated building proj from template, no longer suport other domains and work in different envs 2014-04-09 08:24:23 +01:00
Henry Oswald
0668dec65e killed project controller 2014-04-08 21:24:33 +01:00
Henry Oswald
5ac1b59a78 added err check to project list page 2014-04-08 21:06:01 +01:00
Henry Oswald
811859a4a1 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-04-08 20:52:06 +01:00
Henry Oswald
71af89902d removed the buffering from update merger, shouldn't be needed in node 0.10 2014-04-08 20:52:02 +01:00
James Allen
ef7a3788b4 Add highlighting when syncing from code to pdf 2014-04-08 18:21:44 +01:00
Henry Oswald
c0780f5a67 made project page load faaaaaaster 2014-04-08 18:02:16 +01:00
Henry Oswald
88ba45b9dc moved load project from old proj controller to new one 2014-04-08 17:44:31 +01:00
James Allen
1444db4fd6 Implement code for syncing from editor to PDF 2014-04-08 17:21:49 +01:00
Henry Oswald
9398625ac5 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-04-08 16:56:38 +01:00
Henry Oswald
a6bd916fbf refactored project list, and updated sig for findAllUsersProjects to include err 2014-04-08 16:56:34 +01:00
James Allen
374cf99ef2 Double click on PDF syncs with code 2014-04-08 16:49:21 +01:00
Henry Oswald
0c921d9188 moved project list to new project controller and added tests 2014-04-08 16:40:12 +01:00
Henry Oswald
6b6c447901 clened up new project controller 2014-04-08 15:28:18 +01:00
Henry Oswald
15bddae931 moved new project from old proj controller to new one with test 2014-04-08 15:25:27 +01:00
James Allen
892e6bf6d1 Add in a synctex end point 2014-04-08 15:18:56 +01:00
Henry Oswald
6f84f4214f moved clone project from old proj controller to new one with test 2014-04-08 14:53:33 +01:00
Henry Oswald
5b757ac7ab moved delete project from old proj controller to new one with test 2014-04-08 14:34:03 +01:00
James Allen
da0ed94488 Make inconsistency check more reliable and less likely to trigger a false positive 2014-04-08 10:51:33 +01:00
Henry Oswald
bc07525d71 broken dropbox endpoints for user into its own controller 2014-04-07 21:49:22 +01:00
Henry Oswald
6891d1bfb5 killed off project handler, also removed unused changeUsersPrivilegeLevel 2014-04-07 20:54:06 +01:00
Henry Oswald
248e81407a leaving project fades it out from the list fix 2014-04-07 20:47:29 +01:00
Henry Oswald
430cf5cea8 created CollaboratorsHandler 2014-04-07 20:46:58 +01:00
Henry Oswald
ff88849444 added a change privlage level for user to new collab handler, won't work yet but is starting point 2014-04-07 16:54:51 +01:00
Henry Oswald
fa78db5c59 moved setPublicAccessLevel to project details handler 2014-04-07 16:07:44 +01:00
Henry Oswald
d229269a69 moved rename project to project details handler 2014-04-07 15:37:40 +01:00
Henry Oswald
ddbf04c267 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-04-07 13:47:26 +01:00
Henry Oswald
9134fa7b4c moved deleteProject to the project deleter 2014-04-07 13:47:10 +01:00
James Allen
a12716ab6b Show saving dialog based on whether there are inflight ops, and show a warning when leaving the page if there are 2014-04-07 12:56:09 +01:00
James Allen
6ad8566e24 Check that the ace text matches ShareJS each time 2014-04-07 12:56:09 +01:00
Henry Oswald
5378890e57 moved rename entity to proj entity handler 2014-04-07 12:18:24 +01:00
Henry Oswald
f28bd33168 remove confirmFolder from project handler, not used. 2014-04-07 12:01:10 +01:00
Henry Oswald
439d38441f removed old getRawLogs socket.io endpoint 2014-04-07 11:59:49 +01:00
Henry Oswald
976054377d removed unused getProject from projectHandler 2014-04-07 11:59:31 +01:00
Henry Oswald
4ff8b48d85 generate random password with uuid 2014-04-07 11:14:50 +01:00
Henry Oswald
1ce1a82617 moved admin controller into different feature 2014-04-07 11:02:12 +01:00
Henry Oswald
73bbd5b495 moved info and home controller into static page feature 2014-04-07 10:55:07 +01:00
Henry Oswald
abbbdf463f Merge branch 'master' into i18n 
Conflicts:
	package.json
 2014-04-07 09:53:03 +01:00
Henry Oswald
2288591bae updated tpds background tests 2014-04-05 12:21:34 +01:00
Henry Oswald
b36ced3058 only poll dropbox users who have the dropbox feature 2014-04-05 12:14:50 +01:00
Henry Oswald
33b6626fd9 killed CollaberationManager R.I.P 2014-04-04 17:08:14 +01:00
Henry Oswald
90eac4d52c moved setRootDoc from collab manager to editor controller 2014-04-04 16:59:45 +01:00
Henry Oswald
7c10b5cd24 moved setPublicAccessLevel from collab manager to editor controller 2014-04-04 16:53:59 +01:00
Henry Oswald
08d1eeba78 moved renameProject from collab manager to editor controller 2014-04-04 16:49:44 +01:00
Henry Oswald
d684f04d4f moved moveEntity from collab manager to editor controller 2014-04-04 16:40:53 +01:00
Henry Oswald
88e47bbe12 moved renameEntity from collab manager to editor controller 2014-04-04 16:35:02 +01:00
Henry Oswald
3983e77b73 move deleteProject from collab manager to editor controller 2014-04-04 16:21:30 +01:00
Henry Oswald
68271b04f9 deleted guid manager 2014-04-04 15:58:59 +01:00
Henry Oswald
615e05cb89 moved newsletter manager into its own feature 2014-04-04 15:47:27 +01:00
James Allen
129cf0bf62 Add in support for markdown files 2014-04-04 09:56:20 -04:00
Henry Oswald
24d3828947 updated licence for more thing to be included in the agpl 2014-04-04 14:08:55 +01:00
James Allen
0644cb316d Pick up .ist files in acceptance tests 2014-04-04 08:26:01 -04:00
James Allen
e14470d57f Add acceptance test for nomenclature 2014-04-04 08:25:36 -04:00
James Allen
d2e93fa025 Add acceptance test for custom makeindex styles 2014-04-04 08:25:20 -04:00
James Allen
e9309532d3 Make greyed out background the default track changes prompt 2014-04-04 10:39:56 +01:00
James Allen
7764663552 Merge pull request #60 from antimatter15/master 
Added support for HiDPI displays
 2014-04-03 14:29:22 +01:00
James Allen
5caf5f8a6f Add in acceptance test for asymptote 2014-04-03 09:03:51 -04:00
James Allen
26b0f4658f Ignore external directory 2014-04-03 11:45:30 +01:00
James Allen
186e39c202 Remove external ShareLaTeX pages 2014-04-03 11:43:04 +01:00
Kevin Kwok
10627e56eb Added support for HiDPI displays 2014-04-02 22:21:39 -04:00
James Allen
807dfdc22a Add in defaults setting file 2014-04-02 17:00:14 -04:00
James Allen
ee4a6e869e Fix up settings schema and acceptance tests 2014-04-02 16:58:07 -04:00
James Allen
d0816096b6 Use default settings file 2014-04-02 17:45:41 +01:00
James Allen
72dbefc5ad Resync after an op is not acknowledged rather than throwing an error 2014-04-02 16:17:09 +01:00
Henry Oswald
479b37a48c null check user when getting user id from session 2014-04-02 15:56:54 +01:00
Henry Oswald
b7b307e82b trim project and entiry names/renames 2014-04-02 15:35:05 +01:00
James Allen
b484f08d6e Use system rm -r to allow removal of files with broken char encodings 2014-04-02 12:53:02 +01:00
Henry Oswald
f3ad7e10cd added more logging when an error is passed to next, specifically useful for debugging csrf stuff 2014-04-02 12:44:52 +01:00
Henry Oswald
bd118a57c2 set compile throttle back to 10 2014-04-02 12:18:24 +01:00
Henry Oswald
d71c089092 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-04-02 12:09:10 +01:00
Henry Oswald
250ce20ec0 fix wrong paths for couple of assets img -> brand 2014-04-02 12:08:54 +01:00
James Allen
0df412d241 Improve granularity and length of client side logs 2014-04-01 16:51:20 +01:00
Henry Oswald
d3306d8c21 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-04-01 16:23:18 +01:00
Henry Oswald
6c700b1b6b updated more modules, mongojs and redis are the big ones 2014-04-01 16:23:13 +01:00
James Allen
9f966996be Monkey patch request in smoke tests to work around secnding secure cookie over HTTP 2014-04-01 12:53:16 +01:00
Henry Oswald
d41807e667 changed smoke test message 2014-04-01 11:14:31 +01:00
Henry Oswald
eabd440bb6 fixed a couple of tests which broke after async upgrade 2014-03-31 18:05:33 +01:00
Henry Oswald
9cec91172c bumped up a lot of libs 2014-03-31 17:24:41 +01:00
Henry Oswald
78db95b539 removed dead packages 2014-03-31 17:00:16 +01:00
Henry Oswald
f0aeff2904 updated mongodb drivers 2014-03-31 16:59:35 +01:00
Henry Oswald
8ce13a6b1e changed xss lib to sanitize not validator 2014-03-31 16:46:28 +01:00
James Allen
5e5f9cf4e5 Replace all instances of / in file paths in FSPersistorManager 2014-03-31 15:17:17 +01:00
James Allen
869a4c8c18 Log and report events like sending and receiving updates 2014-03-31 13:30:47 +01:00
James Allen
81cb986f89 Always keep doc_id update to date in track changes 2014-03-31 11:55:21 +01:00
Henry Oswald
077266b7c9 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-31 10:55:09 +01:00
Henry Oswald
cd683cc719 check user isn't null in project controller 2014-03-31 10:54:49 +01:00
James Allen
095f950258 Don't choke when passed null doc to openDoc 2014-03-31 10:22:18 +01:00
James Allen
2ca70f25f6 Make track changes default with override for old history 2014-03-31 09:47:36 +01:00
James Allen
3b079cde92 Change CLSI proxy errors to warnings 2014-03-28 16:04:44 +00:00
James Allen
953081c39d Delete updates that are older than a week, unless versioning or preserveHistory is enabled 2014-03-28 16:01:34 +00:00
James Allen
9f1efe6dca Add in getProjectDetails to WebApiManager 2014-03-28 13:05:16 +00:00
James Allen
6318d9ace1 Return features along with project details 2014-03-28 12:47:15 +00:00
James Allen
31f39dada1 Allow multi select of users in group page 2014-03-28 12:07:30 +00:00
James Allen
cc522f5d07 Add in debug pop up 2014-03-27 17:33:07 +00:00
James Allen
767b220fab Allow CLSI cache to be cleared from within the editor 2014-03-27 17:00:41 +00:00
James Allen
7515586f3b Add in direct link to bonus page 2014-03-27 16:04:10 +00:00
James Allen
544415ce1d Remove trailing } when autocompleting from within a \begin{...} command 2014-03-27 15:51:19 +00:00
James Allen
e1a130a941 Don't slow shrink PDF panel with each reload 2014-03-27 13:19:12 +00:00
James Allen
d81512f6d6 Improve style of changed labels 2014-03-27 13:02:34 +00:00
James Allen
6c77ee4861 Highlight the changed files in the file list view 2014-03-27 12:45:11 +00:00
Henry Oswald
9145a1c9ba added cleanup.js back in 2014-03-27 07:12:52 +00:00
Henry Oswald
c718535068 use github translate-sharelatex module 2014-03-26 17:30:25 +00:00
Henry Oswald
ebacf86485 changed i18n to use seperate translate module which holds the translations 2014-03-26 16:35:13 +00:00
Henry Oswald
721eda71f3 show the publish template area to all project owners 2014-03-26 16:01:10 +00:00
Henry Oswald
fe16bea798 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-26 15:52:58 +00:00
James Allen
0255e08e1f Don't show upgrade prompts for non-owners 2014-03-26 13:20:08 +00:00
James Allen
cb1020d5c1 Reduce timeout 2014-03-25 23:05:55 +00:00
James Allen
73b67026c7 Only put timeout on response, not whole request 2014-03-25 23:05:32 +00:00
James Allen
1ec8bdcaea Add timeout to tpds worker 2014-03-25 22:28:39 +00:00
James Allen
8146dd7ce9 Intercept response status code in tpds worker and catch errors before proxying 2014-03-25 21:43:42 +00:00
James Allen
6f2b7e43a6 Add in tooltips to make the radio buttons clearer in the history view 2014-03-25 16:44:30 +00:00
James Allen
0e54c4ae49 Set up history with AB testing for different methods of upgrading 2014-03-25 16:44:30 +00:00
James Allen
dfdfba4b2e Undelegate old events when refreshing history 2014-03-25 16:44:30 +00:00
James Allen
fe99be48ac Add upgrade message to history for free users 2014-03-25 16:44:30 +00:00
James Allen
a434243bd2 Fix slight history range glitch 2014-03-25 16:44:29 +00:00
James Allen
c273f36bb0 Order errors by severity. error -> warning -> typsetting 2014-03-25 16:44:29 +00:00
Henry Oswald
ba1371744b deal with users who may have been deleted but are still inside a subscription group 2014-03-25 16:19:30 +00:00
Henry Oswald
116458671c callback is not defined, use next when there is an error in controller 2014-03-25 14:39:51 +00:00
Henry Oswald
1e74f9a862 rename dropdown -> dropbox 2014-03-25 13:15:59 +00:00
Henry Oswald
4298c862cb remove extra coma from qqq 2014-03-25 12:41:47 +00:00
James Allen
22e3aac5b0 Don't trip up over empty ops 2014-03-25 11:40:48 +00:00
Henry Oswald
7ae79e98d4 Merge branch 'i18n' of github.com:sharelatex/web-sharelatex into i18n 2014-03-25 11:27:47 +00:00
Henry Oswald
76f0acd49d Merge branch 'master' of github.com:sharelatex/web-sharelatex into i18n 2014-03-25 11:27:39 +00:00
Henry Oswald
f13f036e55 add public into project public access level issue #35 2014-03-25 11:01:16 +00:00
Henry Oswald
ea9ba59371 updated google anltyics experiment code 2014-03-24 22:24:09 +00:00
Siebrand Mazeland
ea05a6ef58 Tweaks to the i18n file 
Remove some superfluous newlines and the last comma.
 2014-03-24 20:59:54 +01:00
Henry Oswald
a86e95c711 added bulk of translations in with qqq info about them all 2014-03-24 19:30:47 +00:00
Henry Oswald
063a583ad3 got basic i18n working in express 2014-03-24 17:18:58 +00:00
Henry Oswald
2968fbcfff Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-24 15:24:01 +00:00
Henry Oswald
c68f2661a8 uri encode email and project names used in shared url 2014-03-24 15:23:50 +00:00
James Allen
66eb5e22f6 Always load font-awesome 2014-03-24 13:30:56 +00:00
James Allen
8a4dbf6618 Group changes by day for more concise display 2014-03-24 12:22:54 +00:00
Henry Oswald
49b5d99a0a Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-24 10:54:14 +00:00
Henry Oswald
f15f358878 increase saving alert message from 1 second to 3 seconds 2014-03-24 10:53:37 +00:00
James Allen
dc2dfaa66c Flush project to track changes when leaving 2014-03-22 09:34:43 +00:00
Henry Oswald
8b706d6934 added some more event tracking in for google analytics 2014-03-21 18:33:53 +00:00
Henry Oswald
af659e7690 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-21 17:49:25 +00:00
Henry Oswald
4988fc4136 setup second plans page with free trial using google analytics experiements 2014-03-21 17:49:20 +00:00
James Allen
bd4bb3d3cf Add in project flushing end point 2014-03-21 15:57:17 +00:00
James Allen
2581af0cda Handle deleted files semi-gracefully 2014-03-21 14:48:26 +00:00
James Allen
8cae726838 Backport project_id onto doc updates that don't have one yet 2014-03-21 14:40:51 +00:00
James Allen
5f8ed42006 Show blank diff for files that haven't changed 2014-03-21 14:31:04 +00:00
James Allen
2a3e7ba9f3 Move restore button and logic into diff view 2014-03-21 14:31:04 +00:00
James Allen
2cd85fefec Flush all docs in a project before getting updates 2014-03-21 13:48:14 +00:00
James Allen
cd9cb51027 Delete doc_id from DocsWithHistoryOps set when processing 2014-03-21 13:17:58 +00:00
James Allen
375427bf5e Remove extraneous logging 2014-03-21 13:15:42 +00:00
James Allen
c0be3ef37b Put doc_ids with history changes into project level set 2014-03-21 12:41:05 +00:00
Henry Oswald
63a5f2bf44 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-21 12:20:58 +00:00
Henry Oswald
2cca6c3775 changed event tracking to work correctly, only certain json attrs are allowed 2014-03-21 12:20:33 +00:00
Henry Oswald
3e3b1d3f5b remove codemirror.css 2014-03-21 11:36:14 +00:00
James Allen
70da673bed Move track changes activation into old history place 2014-03-20 16:45:39 +00:00
James Allen
237f738650 Allow changing between files while in diff view mode 2014-03-20 16:30:52 +00:00
James Allen
b99eaecf82 Load history view using mainAreaManager 2014-03-20 16:30:52 +00:00
James Allen
9fa80ad757 Load diff for selected doc 2014-03-20 16:30:52 +00:00
James Allen
c0686b6592 Load entire project history into change list view 2014-03-20 16:30:52 +00:00
James Allen
6aaa7ba8d5 Group toV and fromV by the doc they correspond to 2014-03-20 13:37:23 +00:00
Henry Oswald
04bdde4d0d added logging around publishing templates and changed another templates-api -> templates 2014-03-20 12:53:23 +00:00
James Allen
5595910122 Return a summary of the entire project changes 2014-03-20 12:10:04 +00:00
Henry Oswald
69904e2acd Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-20 08:52:17 +00:00
Henry Oswald
7310f94511 fire ga events on renames/deletes 2014-03-20 08:52:04 +00:00
Henry Oswald
4f577b5467 add events around upgrade process 2014-03-20 08:18:15 +00:00
James Allen
b7de4c9c6c Implement project update getter methods 2014-03-19 17:44:16 +00:00
James Allen
962fc18329 Store project_id alongside each change 2014-03-19 16:40:55 +00:00
James Allen
fec648666c Add in project_id to flushing HTTP endpoint 2014-03-19 16:14:17 +00:00
James Allen
2d28f1903f Flush to the track changes api using the project id as well 2014-03-19 15:56:44 +00:00
James Allen
7d50c9c7aa Use different color schemes for dark or light editor schemes 2014-03-19 11:23:27 +00:00
James Allen
d5f130ad07 Improve more change messages and make them clickable 2014-03-19 10:53:05 +00:00
James Allen
1398d85626 Improve date format in change list 2014-03-19 10:53:05 +00:00
James Allen
a8ca388146 Allow shift-click to select multiple versions 2014-03-19 10:53:05 +00:00
James Allen
d32b0ee12f Fetch updates up to the limit, even after summarising 2014-03-18 18:09:25 +00:00
Henry Oswald
3c9f6e0ce0 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-18 15:09:50 +00:00
Henry Oswald
87167841d0 set holding account to false when registered 2014-03-18 15:09:44 +00:00
Henry Oswald
069efaba1b dont show publish area if it is an open user 2014-03-18 15:08:09 +00:00
Henry Oswald
8cb21ee2f9 adds compile function to grunt file for tpds worker and background jobs worker 2014-03-18 15:07:16 +00:00
Henry Oswald
fc2b42400f Merge pull request #54 from cwoac/nodemailer-passthrough 
Nodemailer passthrough
 2014-03-18 13:09:14 +00:00
James Allen
81811d7cc5 Move update summarizing logic into UpdatesManager 2014-03-18 11:41:48 +00:00
James Allen
22a806a200 Fix issues with consuming delete updates beyond the end of the diff 2014-03-17 14:54:02 +00:00
James Allen
ea0b0c2ec2 Fine tune logging 2014-03-17 12:50:30 +00:00
James Allen
9010557a75 Update snippets 2014-03-17 12:50:24 +00:00
James Allen
14bf20e087 Fix broken sharing page when not the owner of a project 2014-03-15 11:56:18 +00:00
James Allen
a99783edc7 Log more information in the client side errors 2014-03-14 17:23:50 +00:00
James Allen
5efd19ffc4 Update the styling and workflow around publishing a template 2014-03-14 14:42:38 +00:00
James Allen
7b2eef22a9 remove console.log debugging line 2014-03-14 12:25:25 +00:00
James Allen
498e0d4787 Fix unit tests 2014-03-14 11:56:15 +00:00
James Allen
4c76b88a2d Log out incoming and outgoing real-time updates 2014-03-14 11:51:19 +00:00
James Allen
745d112d2b Report client side ShareJs error back to server and log them out 2014-03-14 11:14:33 +00:00
James Allen
6701de796e Resize diff view on editor view port change 2014-03-14 10:20:00 +00:00
Henry Oswald
191170509f bumped convert timeout to 40 seconds 2014-03-14 08:55:28 +00:00
James Allen
b3096fc74e Show helpers to make navigating around diffs easier 2014-03-13 17:32:39 +00:00
Henry Oswald
9a86f24bf7 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-13 17:10:15 +00:00
Henry Oswald
b4c5f6f253 don't show the template area for non owners 2014-03-13 17:10:06 +00:00
James Allen
df706da7e0 Add history entry into context menu for docs 2014-03-13 14:32:30 +00:00
James Allen
540aaf0672 Add in some null checks 2014-03-13 14:30:01 +00:00
Henry Oswald
41b32deac3 changed conversions to work with new image magick feature pdf:fit-page= 2014-03-13 14:04:46 +00:00
James Allen
81fcafb476 Make track changes a feature flag 2014-03-13 13:58:57 +00:00
James Allen
7aab6c4c0b Add in dropdown and context menu for files 2014-03-13 13:01:04 +00:00
Henry Oswald
4864eeba0a check if files exist before fingerprinting them issue #75 on sharelatex 2014-03-13 12:38:16 +00:00
Henry Oswald
c237d04456 fingerprint brand/plans.css 2014-03-13 10:06:33 +00:00
Henry Oswald
f7545393f2 fix bad logging on email sender 2014-03-12 23:37:54 +00:00
Henry Oswald
fa6065b298 changed logging which was causing error, reading _id on null 2014-03-12 23:37:10 +00:00
Henry Oswald
b7104a82e9 added null check when filtering elements 2014-03-12 22:44:15 +00:00
Henry Oswald
e7f8d11e45 added checks on error and response status code for smoke tests to make them easier to follow in logs 2014-03-12 22:29:44 +00:00
Henry Oswald
d20286febd stop response sending twice if compile takes a long time when testing 2014-03-12 21:56:58 +00:00
Henry Oswald
52cb1a4dcd Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-12 21:33:27 +00:00
Henry Oswald
77aadf1845 plans.css trying to fingerprint wrong file 2014-03-12 21:33:15 +00:00
James Allen
451ff14e65 Improve track changes css 2014-03-12 17:13:38 +00:00
James Allen
05443b85da Automatically show a sensible diff to start 2014-03-12 17:09:11 +00:00
James Allen
e0da6da4c6 Improve hover info in diff 2014-03-12 16:46:20 +00:00
Oliver Matthews
efbb17a3b9 move all parameter handling to nodemailer. 2014-03-12 15:38:40 +00:00
James Allen
9977a418c3 Compare diffs with user.id, not user_id 2014-03-12 14:04:33 +00:00
James Allen
575afae048 Compress adjacent inserts and deletes into one diff item 2014-03-12 13:27:18 +00:00
James Allen
be64b510e8 Support the new update format from the track changes api 2014-03-11 18:01:14 +00:00
James Allen
7fa88f6b41 Summarise updates when returning them 2014-03-11 17:40:07 +00:00
James Allen
4ecb17b16e Put multiple ops in one update 2014-03-11 15:24:38 +00:00
James Allen
064bdc3eea Take user id in from request header and pass to doc updater 2014-03-11 13:01:07 +00:00
James Allen
4f878e000b Allow source and user_id to be included when setting a document 2014-03-11 12:47:26 +00:00
James Allen
da9fa28612 Remove mention of Dropbox in external update dialog 2014-03-11 12:16:51 +00:00
James Allen
1a9c86417c Add question mark to restore modal 2014-03-11 12:14:52 +00:00
James Allen
afb8bb6a42 Add in restore button to track changes 2014-03-11 12:14:52 +00:00
Henry Oswald
e364fd9c5f moved id for cancel selector to correct button 2014-03-11 11:47:24 +00:00
James Allen
3d1d962501 Don't try to fetch user when id doesn't exist 2014-03-11 11:45:25 +00:00
Henry Oswald
260c5210a6 changed ga tracking created -> subscribed, fixed indentation on cancel sub events 2014-03-11 11:22:03 +00:00
James Allen
83b2aa3082 add in restore end point 2014-03-10 16:58:39 +00:00
James Allen
7eb8699b93 Refactor diff manager 2014-03-10 16:03:03 +00:00
Henry Oswald
92c68177a6 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-10 15:08:04 +00:00
Henry Oswald
70fcac19a6 added message of failed login/register into google analytics 2014-03-10 15:07:54 +00:00
James Allen
417d76ab3f Create (hopefully) more intuitive change selector 2014-03-10 14:59:01 +00:00
James Allen
ceca16e507 Remove double quote from end of array snippet 2014-03-10 14:59:01 +00:00
Henry Oswald
21ec74e51c hooked up the recurly config to recurly.js correctly 2014-03-09 10:23:37 +00:00
Henry Oswald
eeee980bd2 removed ab testing from main.coffee 2014-03-09 10:14:58 +00:00
Henry Oswald
3d0bd34b50 added event tracking to subscription cretion/cancelation 2014-03-09 09:56:58 +00:00
Henry Oswald
e7602321e9 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-08 19:01:21 +00:00
Henry Oswald
0e7d241fcf fixed has subscription check causing bad redirects 
subscription != recurlySubscription
 2014-03-08 19:01:00 +00:00
Henry Oswald
f2069c6208 converted all analytics to use new google analytics, removing mixpanel 
and heap. Not tracking subscriptions or cancelations yet.
 2014-03-08 19:00:26 +00:00
Henry Oswald
39cecfa5d8 fixed our -> out in about page 2014-03-08 18:09:02 +00:00
James Allen
adc42f7cf6 Remove logging line 2014-03-07 14:48:38 +00:00
James Allen
9c20d1d604 Fix momentjs in project list view 2014-03-07 14:41:01 +00:00
Oliver Matthews
8989284e10 move from node-ses to nodemailer 2014-03-07 14:08:21 +00:00
James Allen
866084ee6b Pop last version, not last timestamp 2014-03-07 14:02:16 +00:00
James Allen
a0b02d85f5 Load changes in batches of 25 2014-03-07 13:31:30 +00:00
James Allen
9851321429 Merge branch 'track_changes_integration' 2014-03-07 13:17:30 +00:00
James Allen
548d7d98a4 Allow history view to be closed 2014-03-07 13:05:59 +00:00
James Allen
e0cd9ba163 Improve the description above each change 2014-03-07 12:54:08 +00:00
James Allen
ebe4e5b1d8 Show consistent colors for different users 2014-03-07 12:00:31 +00:00
James Allen
36faedeeb3 Make the history entries pretty 2014-03-07 11:24:11 +00:00
James Allen
be8035faa8 Include names in view 2014-03-06 18:13:07 +00:00
James Allen
b45db3aa2b Return user details like email and name in updates 2014-03-06 18:04:00 +00:00
James Allen
9329213d94 Allow multiple diffs to be selected 2014-03-06 16:32:18 +00:00
James Allen
1a91036bb6 Show nice diffs using ace and markers 2014-03-06 14:08:12 +00:00
Henry Oswald
7efa51fb62 Merge pull request #51 from cwoac/reduce_doclines_logging 
don't log doc contents if file is unchanged.
 2014-03-06 12:50:52 +00:00
Henry Oswald
38d3bbb556 changed underscore templating to be standard syntax thoughout fixing main.tex name inserting bug, added tests to catch it in future 2014-03-06 12:28:07 +00:00
Henry Oswald
92928c35ab removed old email tempaltes 2014-03-06 11:53:24 +00:00
James Allen
5fc139db00 Return version numbers of updates 2014-03-06 11:00:49 +00:00
Oliver Matthews
b73d7f23c3 don't log doc contents if file is unchanged. 2014-03-06 10:53:59 +00:00
James Allen
aadce232a1 Use version numbers for sorting and querying, not dates 2014-03-06 10:45:51 +00:00
Henry Oswald
5fc620dc10 move when template publish status is refreshed to avoid loop 2014-03-06 10:13:24 +00:00
Henry Oswald
f5e802a7d1 added null check for email property #ugly 2014-03-06 09:51:19 +00:00
Henry Oswald
9ae85abb74 got my email null check the wrong way around 2014-03-05 22:57:28 +00:00
Henry Oswald
e433eca157 added null checks into email sender for from address 2014-03-05 22:37:55 +00:00
Henry Oswald
e8b245e857 check that res has not already been sent before sending catch 500 2014-03-05 18:13:40 +00:00
James Allen
bf21305c68 Add in basic list of changes in track changes view 2014-03-05 17:55:47 +00:00
Henry Oswald
2f22563d59 changed key for templates to put /v/ in for version 2014-03-05 17:39:27 +00:00
James Allen
8bf12f3286 Wrap editor in wrapper div and remove orchard CSS 2014-03-05 16:55:03 +00:00
James Allen
0468cbc300 Add in proxy to track changes api 2014-03-05 16:31:52 +00:00
James Allen
2e1307bd82 Doc is always one version ahead of latest op version 2014-03-05 16:31:38 +00:00
Henry Oswald
32f9e33f71 removed heap analytics for the time being 2014-03-05 15:59:48 +00:00
James Allen
3660253fd4 Add in /updates end point to get updates 2014-03-05 15:59:40 +00:00
Henry Oswald
64257a7b2c testing out new google analytics 2014-03-05 15:45:24 +00:00
James Allen
a46963a349 Refactor arguments to MongoManager.getUpdatesBetweenDates 2014-03-05 15:06:46 +00:00
Henry Oswald
1842a65b83 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-05 15:05:43 +00:00
Henry Oswald
ffe690afa3 hooked up lifetime emails 2014-03-05 14:56:52 +00:00
Henry Oswald
a9327cb7c5 replyTo is overridable when sending email 2014-03-05 13:33:41 +00:00
James Allen
188d620ce1 Log out and put the last update back when an error occurs 2014-03-05 13:22:38 +00:00
Henry Oswald
274682a83d deleted email manager 2014-03-05 12:07:09 +00:00
Henry Oswald
3431cf9070 share project email uses new email sender 2014-03-05 12:06:28 +00:00
Henry Oswald
8ba1a08245 hooked up password reset to use new email sending 2014-03-05 11:57:57 +00:00
Henry Oswald
3c18cc5553 email sending options are configurable from settings 2014-03-05 11:31:40 +00:00
Henry Oswald
5bacb2d784 added settings check on sending lifcycle emails out 2014-03-05 11:22:52 +00:00
Henry Oswald
eb92e5832b renamed email templator -> email builder 2014-03-05 11:22:34 +00:00
James Allen
f781001280 Don't return current prefix in auto-complete list 2014-03-05 11:16:33 +00:00
James Allen
06831e555e Add in some basic snippets 2014-03-05 11:06:12 +00:00
James Allen
d221e336f0 Match auto complete font size to editor font size 2014-03-05 11:06:12 +00:00
James Allen
934f3cbcd8 Use Ace's built in auto-completer 2014-03-05 11:06:12 +00:00
Henry Oswald
1e1c14e5fe Merge pull request #11 from cwoac/FSPersistorManager 
Fs persistor manager - merge from cwoac
 2014-03-05 10:39:26 +00:00
Henry Oswald
360fac9510 setup basic new email feature which is tested, not linked up to real 
events yet
 2014-03-04 18:10:06 +00:00
Henry Oswald
67e9d0724d increased auto compile limits 2014-03-04 15:29:45 +00:00
James Allen
e4d8cc7a11 Add in acceptance tests for getting a diff 2014-03-04 15:27:03 +00:00
Oliver Matthews
f920fd0b16 match refactor_config on cwoac/sharelatex 2014-03-04 15:24:50 +00:00
Oliver Matthews
957df0eb04 Don't dump streams to log files. 2014-03-04 14:45:32 +00:00
Henry Oswald
711e95a82a delete converted file when finished to clean up 2014-03-04 14:30:52 +00:00
James Allen
8b71d222d4 Create DiffManager.getDiff 2014-03-04 14:05:17 +00:00
James Allen
1d1dcdfa2f Add in methods for retrieving updates and doc version 2014-03-04 13:02:48 +00:00
Henry Oswald
94a6504635 cranked up kill to child processes to killSignal: "SIGKILL" 2014-03-04 12:44:16 +00:00
James Allen
5d45e191f3 Don't crash when logging out error 2014-03-04 12:39:02 +00:00
Henry Oswald
149b51ddc6 put published date on template publishing area 2014-03-03 23:04:30 +00:00
Henry Oswald
413ef7440f added a republish button to templates 2014-03-03 22:55:12 +00:00
Henry Oswald
07fe9c36a9 use window.csrftoken for adding user to group subscription 2014-03-03 17:58:26 +00:00
Henry Oswald
a0805f97e0 added bulk removing of users to group admin panel 2014-03-03 17:48:48 +00:00
James Allen
20d70859aa Create buildDiff function 2014-03-03 17:39:59 +00:00
Henry Oswald
c991625a27 added uni message to plans page back in 2014-03-03 16:41:59 +00:00
Henry Oswald
99dc141693 deleteing user account cancels any subscription 2014-03-03 16:22:55 +00:00
Henry Oswald
fe026b4b0b changed templates port to 3007 which is line with elsewhere 2014-03-03 16:19:52 +00:00
James Allen
8d044b7f13 Fix acceptance tests 2014-03-03 13:36:05 +00:00
James Allen
ba2c4768d0 Use port 3015 by default 2014-03-03 13:31:10 +00:00
James Allen
c15df4c2aa Add in /status end point 2014-03-03 13:14:01 +00:00
Henry Oswald
dd22f1f7a1 added redis connection settings into rate limiter 2014-03-03 11:46:40 +00:00
Oliver Matthews
40e2cb1c6d fix tabbing 2014-03-01 15:23:11 +00:00
Oliver Matthews
88cc89a0d1 filter /s from key ids 2014-03-01 15:10:47 +00:00
James Allen
e0402692cf Add in diff generating functions 2014-03-01 13:31:34 +00:00
James Allen
76cdd5cf98 Delete only the updates that were processed, not a full batch 2014-03-01 11:42:31 +00:00
James Allen
86195ce7c3 Add in load throttling based on a redis key 2014-02-28 19:09:29 +00:00
James Allen
3d70f9126e Flush track changes api every 50 updates 2014-02-28 18:29:05 +00:00
Henry Oswald
ff8320bce0 added new rate limit file based on redback. converetd auto compile to 
use it.
 2014-02-28 17:59:54 +00:00
Henry Oswald
aa0d26d5ab Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-02-27 17:35:48 +00:00
Henry Oswald
303a0e985b improved the publish button process so it talks to the templates-api and lets the user know what is going on 2014-02-27 17:35:35 +00:00
James Allen
d1e18d82aa Add simple benchmark script 2014-02-26 17:35:10 +00:00
James Allen
77c5a27e12 Set up acceptance tests in TravisCI 2014-02-26 16:54:35 +00:00
James Allen
3570e8f408 Use grunt forever to run service daemonized for acceptance testing on travis 2014-02-26 16:44:13 +00:00
James Allen
53db11466b Fix YAML 2014-02-26 16:39:58 +00:00
James Allen
cef17a7fbc Experiment with acceptance tests in Travis 2014-02-26 16:36:53 +00:00
James Allen
6e9485c0c4 Add README and LICENSE 2014-02-26 16:29:14 +00:00
James Allen
1e7fc3dc29 Add Travis CI 2014-02-26 16:27:09 +00:00
James Allen
834f41eea1 Remove Rakefile 2014-02-26 16:17:26 +00:00
James Allen
ad18c1d5a5 Add Gruntfile 2014-02-26 16:17:15 +00:00
James Allen
f3192da87f Tell track changes api to flush doc when flushing doc to mongo 2014-02-26 15:56:52 +00:00
Oliver Matthews
7c5634044f Allow selection of FS persistor manager. Only require the chosen persistor manager. 2014-02-26 15:15:03 +00:00
Christopher Adams
2b5e369b98 Fix example request URL and JSON 2014-02-26 10:13:09 -05:00
Oliver Matthews
ff96f37b2d unit test passing version of FSPersistorManager 2014-02-26 15:10:55 +00:00
Christopher Adams
d829f83226 Correct installation task from compile to install 2014-02-26 10:09:18 -05:00
James Allen
dfd3ec993b Ensure version is still returned from redis 2014-02-26 14:49:52 +00:00
James Allen
a21f8a8004 Add acceptance test for batch processing 2014-02-26 12:44:13 +00:00
James Allen
80af34895b Refactor and improve acceptance tests 2014-02-26 12:38:47 +00:00
James Allen
d27872c9bd Get acceptance tests running 2014-02-26 12:11:45 +00:00
Oliver Matthews
53bcdccc04 change the method for assuming s3 2014-02-26 11:58:48 +00:00
Oliver Matthews
e0f0bfb0ea revert settings.persistorManager 2014-02-26 11:49:15 +00:00
James Allen
45fe6978af Add in /doc/<doc-id>/flush endpoint 2014-02-26 11:34:56 +00:00
Henry Oswald
cfe13af6ff Merge pull request #45 from chid/crash-fix 
add proper error handlers to the UserController class
 2014-02-26 11:21:23 +00:00
James Allen
65360a9a2b Continue to process raw updates until redis is empty 2014-02-26 11:18:26 +00:00
James Allen
8405a37c2c Add a lock around processing updates 2014-02-26 10:55:20 +00:00
Oliver Matthews
4b5f9ad4fb make s3 chosen if no config option specified 
rename *wrapper  to FilestoreManager
remove ToS3 from filestore commands
rename configuration option for filestore.
add details of interface to FilestoreWrapper.coffee for reference.
remove api comments
rename settings.filestoreManager to settings.persistorManager
 2014-02-26 10:24:51 +00:00
Henry Oswald
c9af5e5420 Renamed fsWrapper to PersistorManager 
not 100% happy with that still but its the best I can see so far
 2014-02-26 09:15:37 +00:00
Henry Oswald
49ffeb633d fix where cacheWarm param is read from and improved some logging 2014-02-26 09:06:47 +00:00
Henry Oswald
cad8e0eb1c Update bonus.jade - remove extra comma 2014-02-26 08:52:57 +00:00
Charley Peng
fa80b0c3d2 fixing incorrectly written variable 2014-02-26 08:58:51 +11:00
James Allen
f33a3bde3e Create processUncompressedUpdates method 2014-02-25 16:48:42 +00:00
Henry Oswald
d41eca68a2 Merge pull request #8 from cwoac/localfs 
Allow multiple backends
 2014-02-25 16:37:16 +00:00
James Allen
34d3847fe4 Add Redis Manager for fetching and deleting uncompressed ops 2014-02-25 16:27:14 +00:00
Oliver Matthews
5f87dfb3bf add unit tests for fsWrapper 
make other unit tests no longer depend on fsWrapper
 2014-02-25 15:52:30 +00:00
James Allen
8ae9bcd60f Ensure that updates are compressed in continuous incrementing order 2014-02-25 12:28:15 +00:00
James Allen
c723fbb789 Remove fold all command which interferes with typing } on Danish keyboards 2014-02-25 10:58:35 +00:00
Oliver Matthews
c43533b5cb move test wrapper into fsWrapper where appropriate 2014-02-25 10:54:51 +00:00
Oliver Matthews
f68080d56c create mixin to allow switching of backend 2014-02-25 09:10:22 +00:00
James Allen
de783bf5b0 Pull out MongoManager module and add tests 2014-02-24 17:43:27 +00:00
James Allen
b13f70eadb Push ops into uncompressedHistoryOps list 2014-02-24 16:52:12 +00:00
James Allen
6f19f46d96 Create method for pushing uncompressed ops into redis 2014-02-24 16:40:29 +00:00
James Allen
9cf883e59f Merge branch 'master' into remove_mongo_doc_ops 2014-02-24 16:17:30 +00:00
James Allen
7a977ca597 Don't store ops in Mongo, just keep them in redis with a timeout 2014-02-24 16:13:36 +00:00
James Allen
0dea22a8e9 Add in Travis CI badge 2014-02-24 14:45:00 +00:00
James Allen
64fec8aed7 Update README.md 2014-02-24 14:44:03 +00:00
James Allen
86e42ce1de Update README.md 2014-02-24 14:43:33 +00:00
James Allen
6b450a45a7 Update .travis.yml 2014-02-24 14:42:36 +00:00
James Allen
49feb6b839 Update .travis.yml 2014-02-24 14:40:42 +00:00
James Allen
55edef6d3d Update .travis.yml 2014-02-24 14:37:38 +00:00
James Allen
4d6d4eb6a2 Create .travis.yml 2014-02-24 14:27:06 +00:00
James Allen
4756b488ee Create .travis.yml 2014-02-24 14:26:38 +00:00
James Allen
1a7d2643c0 Create .travis.yml 2014-02-24 14:24:44 +00:00
James Allen
2c69cbbb78 Add travis badge 2014-02-24 14:14:09 +00:00
James Allen
11b908f276 Install grunt-cli before running install 2014-02-24 14:05:09 +00:00
James Allen
ace74c8d7c Create .travis.yml 2014-02-24 13:50:55 +00:00
palkan
283338a26d fix log wrap 2014-02-24 13:24:01 +04:00
James Allen
128c982ba2 Add open source banner to footer 2014-02-22 11:26:36 +00:00
James Allen
c824c2e7b7 Use siteUrl for share links, not hardcoded www.sharelatex.com 2014-02-22 11:09:10 +00:00
James Allen
ca1ebd0413 Take default features from settings 2014-02-22 10:50:59 +00:00
goodbest
45437c6006 change repo URL from git+ssh:// to git+https:// 2014-02-21 23:10:26 +08:00
goodbest
aa9f8882ee change repo URL from git+ssh:// to git+https:// 2014-02-21 23:09:38 +08:00
goodbest
b4482ab41f change repo URL from git+ssh:// to git+https:// 2014-02-21 23:08:19 +08:00
James Allen
07d858e5c3 Use https git URLs instead of SSH 2014-02-21 15:04:41 +00:00
Anton Ilin
0a94441998 Typo fix 
Should be "downloaded" not "downlaoded" :)
 2014-02-21 14:29:06 +02:00
Henry Oswald
029077fe6e downloading a file now sets the filename in header correctly 2014-02-20 22:33:12 +00:00
Henry Oswald
6f4c2a409c Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-02-20 21:26:35 +00:00
Henry Oswald
a9c48d666d fixed broken delete effect due to project id quotes being rendered twice for some unknow reason 2014-02-20 21:26:26 +00:00
Henry Oswald
159670a3d4 reduced timeout to 20 seconds 2014-02-20 11:45:51 +00:00
Henry Oswald
99e15dc12f upped https connections to 300 and added debug logging 2014-02-19 21:03:03 +00:00
Henry Oswald
fada5ecaf4 converted get stream to use knox, test to see if it is more robust 2014-02-19 20:56:45 +00:00
Henry Oswald
3f54688ec8 added max sockets to s3 wrapper, getting some ETIMEDOUT under laod, may be cause 2014-02-19 18:39:25 +00:00
James Allen
e9abd875db Protect against infinite loops with clients send remote changes back to server 2014-02-19 17:16:32 +00:00
Henry Oswald
b24ae77f4c call callback when error returned from getign status of file 2014-02-19 15:26:00 +00:00
Henry Oswald
0a2ce3b869 fixed missleading log file 2014-02-19 15:24:29 +00:00
Henry Oswald
90ad2c24c6 call the callback when no response is returned from s3 when checking if file exists 2014-02-19 14:58:36 +00:00
Henry Oswald
960b46dda0 increased timeout to 4 mins.... 2014-02-19 14:48:16 +00:00
Henry Oswald
b85017759e added more logging 2014-02-19 14:48:16 +00:00
Henry Oswald
531b83a032 added more logging 2014-02-19 14:48:15 +00:00
Henry Oswald
d0600a4b64 changed optimisation to optipng and added timeouts to conversions 2014-02-19 14:48:15 +00:00
Henry Oswald
f63cdb3515 changed thumbnail and preview to be smaller 2014-02-19 14:48:15 +00:00
James Allen
f77906e01e Create README.md 2014-02-19 14:48:15 +00:00
James Allen
5d86dfacd7 Create LICENSE 2014-02-19 14:48:15 +00:00
Henry Oswald
f99a6dc39b changed file converted to use child process with nice 2014-02-19 14:48:12 +00:00
James Allen
9d66fcf715 Use sqlite in development 2014-02-18 17:41:25 +00:00
James Allen
d249158676 Don't try to fingerprint plans.css 2014-02-18 17:37:39 +00:00
James Allen
53929197dd Create LICENSE 2014-02-18 17:23:36 +00:00
James Allen
b45a9968b3 Create README.md 2014-02-18 17:23:12 +00:00
James Allen
e4eca94cdb Update README.md 2014-02-18 17:11:52 +00:00
James Allen
70c6b0b8da Create LICENSE 2014-02-18 17:09:54 +00:00
James Allen
df4516ce95 Update README.md 2014-02-18 17:08:26 +00:00
James Allen
85275a9373 Create README.md 2014-02-18 16:58:21 +00:00
James Allen
2c8be16daa Update REAME with license info 2014-02-18 16:15:30 +00:00
James Allen
00d54ef977 Remove plans.less form Gruntfile 2014-02-18 16:15:20 +00:00
James Allen
01dba44238 Remove proprietary icons and stylesheets 2014-02-18 15:55:32 +00:00
Henry Oswald
1ff5a5adb8 changed error log message 2014-02-17 18:50:28 +00:00
Henry Oswald
5b49ec1144 don't exit on error 2014-02-17 16:32:28 +00:00
Henry Oswald
7501046ebc improved logging 2014-02-17 16:31:33 +00:00
James Allen
110e623a0d Point npm modules at github 2014-02-17 15:09:53 +00:00
James Allen
ff7f2eae04 Use master branch of logger-settings module 2014-02-17 15:09:12 +00:00
James Allen
8e8d25e185 Point custom npm modules to github 2014-02-17 15:08:46 +00:00
James Allen
51b7d8d837 Point settings and logger to github 2014-02-17 15:07:12 +00:00
James Allen
27251a1df1 Install custom npm modules from github 2014-02-17 15:06:53 +00:00
Henry Oswald
347671c89b Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-02-14 18:13:33 +00:00
Henry Oswald
65f849aad0 fixed bug where file uploader was calling cb on read stream not write stream, race condition created. 2014-02-14 18:13:22 +00:00
James Allen
fb02e40423 Standardize grunt file 2014-02-14 16:46:08 +00:00
James Allen
3199aad601 Initial open source commit 2014-02-14 16:39:05 +00:00
James Allen
f4225d38cb Remove unused js files 2014-02-14 15:10:35 +00:00
James Allen
fd911c278f Move copyright images into brand directory 2014-02-14 11:44:09 +00:00
James Allen
4ec7deb7d6 Move plans.css to brand folder 2014-02-14 11:36:06 +00:00
James Allen
3c110ea250 Organise social icons 2014-02-14 11:27:37 +00:00
James Allen
77b7b69a61 Fix formatting in README 2014-02-13 18:19:51 +00:00
James Allen
5ea231dea6 Sort iconshock icons into directory and add credit 2014-02-13 18:18:05 +00:00
James Allen
6eff979e2a Move nide images into one folder 2014-02-13 15:35:44 +00:00
James Allen
e3a2c6ce49 Organise pictos icons 2014-02-13 15:10:49 +00:00
James Allen
754ecaca3c Group Fam Fam silk icons together with readme.txt 2014-02-13 15:00:55 +00:00
James Allen
7fb0dadbfd Remove unneeded image files 2014-02-13 14:47:29 +00:00
Henry Oswald
b46f320882 linked to my twitter on about page 2014-02-13 14:32:07 +00:00
Henry Oswald
3c98dfec90 add Monendra to security acknowledgements list 2014-02-13 14:31:23 +00:00
James Allen
768fd20850 Allow NewletterManager to be called without a callback 2014-02-13 12:37:23 +00:00
James Allen
8771817cdf Fix unit tests 2014-02-13 11:11:53 +00:00
James Allen
73c652fb2c Update a missed setting 2014-02-13 11:08:40 +00:00
James Allen
414b669a2c Point every redis connection to the new config 2014-02-13 10:36:26 +00:00
James Allen
5587ac0acb Fix up smoke tests 2014-02-13 09:33:39 +00:00
James Allen
46b36839e2 Initial open source commit 2014-02-12 17:27:43 +00:00
James Allen
a5d816272e Remove unused DocumentUpdater.js file 2014-02-12 10:52:53 +00:00
James Allen
e1a7d4f24a Initial open sourcing 2014-02-12 10:40:42 +00:00
James Allen
8715690ce9 Intial open source comment 2014-02-12 10:23:40 +00:00
James Allen
d040e7c410 Add acceptance tests for multiple appends 2014-01-27 18:20:38 +00:00
James Allen
d4295c2023 Create HttpController for HTTP requestS 2014-01-27 18:09:37 +00:00
James Allen
5dea123b13 Get append end point working with a simple acceptance test 2014-01-27 17:51:09 +00:00
James Allen
533b8e59a3 Big refactor to use better names and separation of concerns 2014-01-27 16:26:58 +00:00
James Allen
8a0aa55c91 Refactor to take doc ops from an HTTP request from doc updater 2013-09-03 17:17:27 +01:00
James Allen
dab2781e87 Do two passes better 2013-08-23 14:58:00 +01:00
James Allen
dbee4a57fb Compress doc ops in two passes 2013-08-23 14:35:13 +01:00
James Allen
bef05c31f4 No need to print the entire history each time 2013-08-09 13:54:30 +01:00
James Allen
7a3b78da43 Return when calling callback 2013-08-09 13:51:02 +01:00
James Allen
07f078b527 Don't insert a null update if there are no updates or raw updates 2013-08-09 13:46:03 +01:00
James Allen
fe503010aa Pop and set history in batches for speed 2013-08-09 13:27:35 +01:00
James Allen
3ab45c2a35 Handle if two updates cancel each other 2013-08-09 12:36:17 +01:00
James Allen
54c7959647 Match if both user ids are null/undefined 2013-08-09 12:26:23 +01:00
James Allen
64eb794c02 Compress all docs using compressHistory script 2013-08-09 11:36:19 +01:00
James Allen
c5e7f14ba1 Factor methods out into ConversionManager 2013-08-09 11:10:19 +01:00
James Allen
7e96933cf2 Initial commit of script for compressing one docs history 2013-08-08 16:42:14 +01:00
Charley Peng
3f6e240401 adding callback on error 2007-03-01 16:53:59 +11:00