Commit graph

570 commits

Author SHA1 Message Date
James Allen
b6217c401e Merge branch 'master' into master-redesign
Conflicts:
	public/stylesheets/less/trackchanges.less
2014-06-06 15:10:57 +01:00
James Allen
521befddd3 Merge pull request #76 from dfelder/patch-1
Ignore commented lines when setting root doc #52
2014-06-06 14:53:03 +01:00
James Allen
4fbebfbdc6 Tidy up styles 2014-06-06 14:43:45 +01:00
James Allen
5c27ff4430 Don't show diffs of deleted docs (much simpler) 2014-06-06 14:43:45 +01:00
James Allen
02f48be825 Allow docs to be restored 2014-06-06 14:43:45 +01:00
James Allen
1e31024bd7 Show diffs of deleted docs 2014-06-06 14:43:45 +01:00
James Allen
cabaf1ae1a Show deleted documents when viewing history 2014-06-06 14:43:45 +01:00
Daniel Felder
1d12b88b09 Ignore commented lines when setting root doc #52
Same code I used in public/coffee/pdf/CompiledView.coffee. I didn't test it locally though.
2014-06-05 18:00:07 +02:00
Henry Oswald
22c467c231 Merge pull request #75 from dfelder/master
compile current file if top level document #42
2014-06-05 16:42:10 +01:00
James Allen
753a7609e3 Loosely fix responsiveness of header 2014-06-04 17:57:29 +01:00
James Allen
72939e7dd8 Import new navbar design 2014-06-04 17:46:22 +01:00
James Allen
024e21e0ae Upgrade Jade 2014-06-04 16:28:20 +01:00
James Allen
43684fda3a Move to bootstrap 3 (site barely functional) 2014-06-04 16:14:35 +01:00
James Allen
2fb8620ba0 Allow deleting of projects forever 2014-06-04 12:45:04 +01:00
James Allen
4b8f57de80 Add in archived projects link 2014-06-04 11:58:53 +01:00
James Allen
b95c9e1d0a Find file path and act on it one after the other to avoid race condition 2014-06-04 11:46:01 +01:00
James Allen
015fd6873f Allow projects to be restore after being deleted 2014-06-03 17:35:44 +01:00
James Allen
bc6d1cb5be Update latex log parser 2014-06-02 11:44:41 +01:00
Daniel Felder
66dcb376a4 added unit tests 2014-06-01 22:28:19 +02:00
Daniel Felder
4320b790bd adjusting unit tests 2014-06-01 19:26:33 +02:00
Daniel Felder
5ad0ca08f9 adjusting unit tests 2014-06-01 18:16:05 +02:00
Daniel Felder
f03b2df461 compile current file if top level document #42 2014-06-01 16:43:52 +02:00
James Allen
073b52e693 Pass correct path to synctex when not in root folder 2014-05-29 16:41:24 +01:00
James Allen
e1a547c202 Fix multline auto-complete typo 2014-05-27 13:08:01 +01:00
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
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
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
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
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
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
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
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
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
4a27342b01 Merge branch 'docstore_integration' 2014-05-12 14:23:41 +01:00
James Allen
0bddc5552e Use docstore for updating documents 2014-05-08 15:47:50 +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
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
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
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
f3314437ab Create default settings file 2014-04-30 11:33:31 +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
Henry Oswald
0b93a719f0 added statsd metrics timing for each request 2014-04-29 15:20:31 +01:00
Henry Oswald
2cdadf1a4b check for error when doing a password reset 2014-04-29 11:59:23 +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
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
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
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
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
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
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
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
Henry Oswald
24d3828947 updated licence for more thing to be included in the agpl 2014-04-04 14:08:55 +01: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
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
72dbefc5ad Resync after an op is not acknowledged rather than throwing an error 2014-04-02 16:17:09 +01:00