Henry Oswald
|
000be22f16
|
Merge branch 'master-redesign' into master-redesign-templates-and-blog
Conflicts:
app/views/project/editor.jade
|
2014-07-01 15:23:05 +01:00 |
|
James Allen
|
d599cfa7ac
|
Fix unit tests
|
2014-07-01 14:19:52 +01:00 |
|
Henry Oswald
|
53fa15d3db
|
added basic error handling around templates rendering
|
2014-06-30 17:27:13 +01:00 |
|
Henry Oswald
|
27a97b7fa8
|
build titles for tempaltes page in web
|
2014-06-30 17:19:25 +01:00 |
|
Henry Oswald
|
b80f751cb2
|
templates works basically, needs error handling and few little improvments
|
2014-06-30 17:08:54 +01:00 |
|
James Allen
|
0d334a560e
|
fix failing unit test
|
2014-06-27 14:38:08 +01:00 |
|
James Allen
|
afb953a489
|
Display cursor name labels
|
2014-06-26 11:19:05 +01:00 |
|
James Allen
|
9dfbb36a83
|
Update project settings over http
|
2014-06-25 13:51:02 +01:00 |
|
James Allen
|
242a866bce
|
Rename files
|
2014-06-22 20:08:56 +01:00 |
|
James Allen
|
f931df6084
|
Allow creation of folders
|
2014-06-22 14:39:38 +01:00 |
|
James Allen
|
f41534ee4d
|
Add in creating of files to editor
|
2014-06-22 12:10:42 +01:00 |
|
James Allen
|
81845dec32
|
Wire up account settings forms
|
2014-06-20 11:15:25 +01:00 |
|
James Allen
|
0ef7e54ad3
|
Allow partial updates to user settings
|
2014-06-20 09:42:43 +01:00 |
|
James Allen
|
1bcc0a4554
|
Send 204 rather than redirect when leaving a project
|
2014-06-19 13:11:01 +01:00 |
|
James Allen
|
2b349039c3
|
Add in backend multiple project downloading
|
2014-06-18 16:37:18 +01:00 |
|
James Allen
|
aa8969c652
|
Merge and fix external forms
|
2014-06-17 16:19:40 +01:00 |
|
James Allen
|
c56648ab80
|
Merge branch 'master' into master-redesign
Conflicts:
app/views/project/list.jade
public/coffee/list.coffee
public/stylesheets/less/list.less
public/stylesheets/less/style.less
|
2014-06-17 11:54:29 +01:00 |
|
Henry Oswald
|
df44792a10
|
fix tests in user info controller
|
2014-06-17 11:48:14 +01:00 |
|
James Allen
|
65a1f03768
|
Send project owner details to client
|
2014-06-16 13:34:38 +01:00 |
|
James Allen
|
9c5f63817e
|
Send accessLevel info to client
|
2014-06-16 12:47:39 +01:00 |
|
Henry Oswald
|
e099a4a100
|
added default of empty string to user details, fixed route as well
|
2014-06-11 15:14:07 +01:00 |
|
Henry Oswald
|
473da4fa4c
|
endpoint for user details is written
|
2014-06-11 12:46:28 +01:00 |
|
Henry Oswald
|
3aff131428
|
added controller endpoint for updating user personal info
|
2014-06-10 22:26:43 +01:00 |
|
Henry Oswald
|
dabed896be
|
lowercase password reset email
|
2014-06-10 17:54:29 +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
|
cabaf1ae1a
|
Show deleted documents when viewing history
|
2014-06-06 14:43:45 +01: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
|
2fb8620ba0
|
Allow deleting of projects forever
|
2014-06-04 12:45:04 +01:00 |
|
James Allen
|
015fd6873f
|
Allow projects to be restore after being deleted
|
2014-06-03 17:35:44 +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 |
|
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
|
8f41c6dcb2
|
Don't automatically clear the cache
|
2014-05-21 15:20:25 +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
|
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
|
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
|
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
|
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 |
|
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
|
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 |
|
James Allen
|
c73b7fae69
|
Use docstore when creating a new doc
|
2014-05-07 14:31:46 +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 |
|
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
|
f8dec76464
|
Add DocstoreManager
|
2014-04-29 17:22:37 +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
|
d528ac21a3
|
Mark projects as archived, but don't actually delete them
|
2014-04-28 12:53:43 +01:00 |
|
Henry Oswald
|
39b9c99735
|
fix unit tests I broke by adding timeout to tags
|
2014-04-16 17:51:40 +01:00 |
|
Henry Oswald
|
aca2e5639e
|
added referal allocator to user controller
|
2014-04-15 13:59:00 +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
|
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 |
|
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
|
bb7025ad6e
|
moved user update user settings to user controller
|
2014-04-09 16:33:54 +01:00 |
|
Henry Oswald
|
bcfc1bee0c
|
moved unsubscribe endpoint to new user controller
|
2014-04-09 15:41:19 +01:00 |
|
Henry Oswald
|
0d1421b7ee
|
fix user deleter test
|
2014-04-09 15:26:07 +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 |
|
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
|
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
|
88ba45b9dc
|
moved load project from old proj controller to new one
|
2014-04-08 17:44:31 +01:00 |
|
Henry Oswald
|
a6bd916fbf
|
refactored project list, and updated sig for findAllUsersProjects to include err
|
2014-04-08 16:56:34 +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
|
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 |
|
Henry Oswald
|
bc07525d71
|
broken dropbox endpoints for user into its own controller
|
2014-04-07 21:49:22 +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
|
9134fa7b4c
|
moved deleteProject to the project deleter
|
2014-04-07 13:47:10 +01:00 |
|
Henry Oswald
|
5378890e57
|
moved rename entity to proj entity handler
|
2014-04-07 12:18:24 +01:00 |
|
Henry Oswald
|
2288591bae
|
updated tpds background tests
|
2014-04-05 12:21:34 +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
|
615e05cb89
|
moved newsletter manager into its own feature
|
2014-04-04 15:47:27 +01:00 |
|
Henry Oswald
|
479b37a48c
|
null check user when getting user id from session
|
2014-04-02 15:56:54 +01:00 |
|
Henry Oswald
|
eabd440bb6
|
fixed a couple of tests which broke after async upgrade
|
2014-03-31 18:05:33 +01:00 |
|
James Allen
|
6318d9ace1
|
Return features along with project details
|
2014-03-28 12:47:15 +00:00 |
|
James Allen
|
767b220fab
|
Allow CLSI cache to be cleared from within the editor
|
2014-03-27 17:00:41 +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 |
|
James Allen
|
dc2dfaa66c
|
Flush project to track changes when leaving
|
2014-03-22 09:34:43 +00:00 |
|
Henry Oswald
|
04bdde4d0d
|
added logging around publishing templates and changed another templates-api -> templates
|
2014-03-20 12:53:23 +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
|
498e0d4787
|
Fix unit tests
|
2014-03-14 11:56:15 +00:00 |
|
Henry Oswald
|
b7104a82e9
|
added null check when filtering elements
|
2014-03-12 22:44:15 +00:00 |
|
Oliver Matthews
|
efbb17a3b9
|
move all parameter handling to nodemailer.
|
2014-03-12 15:38:40 +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
|
afb8bb6a42
|
Add in restore button to track changes
|
2014-03-11 12:14:52 +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 |
|
Oliver Matthews
|
8989284e10
|
move from node-ses to nodemailer
|
2014-03-07 14:08:21 +00:00 |
|
James Allen
|
9851321429
|
Merge branch 'track_changes_integration'
|
2014-03-07 13:17:30 +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 |
|
James Allen
|
0468cbc300
|
Add in proxy to track changes api
|
2014-03-05 16:31:52 +00:00 |
|
Henry Oswald
|
ffe690afa3
|
hooked up lifetime emails
|
2014-03-05 14:56:52 +00:00 |
|