Henry Oswald
|
259871cbdd
|
added geoip lookup feature
|
2014-10-13 00:45:45 +01:00 |
|
Henry Oswald
|
b90003b11e
|
added custom user dashboard page
|
2014-10-10 15:44:53 +01:00 |
|
Henry Oswald
|
3ba3a91043
|
if its a custom account redirect to /user/subscription/custom_account
|
2014-10-10 15:11:22 +01:00 |
|
Henry Oswald
|
e5ab40c911
|
added example session invalidation code
|
2014-10-09 18:10:01 +01:00 |
|
Henry Oswald
|
e7984a90d7
|
unlink dropbox when a user cancels
|
2014-10-09 17:05:41 +01:00 |
|
James Allen
|
4743b460f5
|
Only show rename or deleted message once
|
2014-10-09 09:13:38 +01:00 |
|
James Allen
|
accd8207b2
|
Show password reset expired message rather than server error if that's what has happened
|
2014-10-08 17:18:24 +01:00 |
|
James Allen
|
128c672edd
|
Merge branch 'github-sync'
Conflicts:
package.json
|
2014-10-08 12:13:37 +01:00 |
|
James Allen
|
dbd85a05f1
|
Send user features and features switches to views where needed
|
2014-10-07 13:31:13 +01:00 |
|
Henry Oswald
|
8789a4bde1
|
server rejects rename of entitys over 150 chars
|
2014-10-07 11:16:26 +01:00 |
|
Henry Oswald
|
b01b05e49b
|
server rejects project names over 150 chars
|
2014-10-07 11:14:02 +01:00 |
|
James Allen
|
6c7c09075c
|
Treat paths properly in project content update methods
|
2014-10-03 11:33:18 +01:00 |
|
James Allen
|
13a96c925b
|
Add in endpoints to allow updating project files when the project id is know
|
2014-10-02 14:15:30 +01:00 |
|
Henry Oswald
|
7f2df4bbd3
|
renamed rate limiter tests
|
2014-09-29 11:42:46 +01:00 |
|
Henry Oswald
|
0d056434e6
|
fixed tests
|
2014-09-26 17:49:31 +01:00 |
|
Henry Oswald
|
558b6cdfde
|
remove test which isn't really that important
|
2014-09-18 14:41:30 +01:00 |
|
Henry Oswald
|
1b02dc72a3
|
destroy session on dropbox webhook
|
2014-09-10 14:19:44 +01:00 |
|
James Allen
|
971afb7342
|
Treat large text files as binary
|
2014-09-04 13:00:51 +01:00 |
|
Henry Oswald
|
e740e4913d
|
if user is already annual tell them so on the annual upgrade page
|
2014-08-29 14:13:05 +01:00 |
|
Henry Oswald
|
416f41e59d
|
stopped using proper settings inside of a test
|
2014-08-29 13:06:50 +01:00 |
|
Henry Oswald
|
aa83b5ca5d
|
fixed tests whoops
|
2014-08-29 12:41:42 +01:00 |
|
Henry Oswald
|
350b95a0a5
|
annual upgrade page works, needs a bit of copy love now
|
2014-08-28 18:14:31 +01:00 |
|
Henry Oswald
|
f5618e9d9c
|
added confirm you want to change plan modal
added page and corisponding endpoint to migrate to annual plan
|
2014-08-27 17:51:10 +01:00 |
|
James Allen
|
894024ba29
|
Don't allow folders to be moved into their child folders
|
2014-08-22 14:38:52 +01:00 |
|
James Allen
|
456d194dbb
|
Merge branch 'james_tmp'
|
2014-08-22 12:51:35 +01:00 |
|
James Allen
|
f093c99b96
|
Remove deprecated background dropbox polling logic
|
2014-08-21 13:01:27 +01:00 |
|
James Allen
|
d0eee7a1e5
|
Refactor template settings
|
2014-08-20 14:47:27 +01:00 |
|
James Allen
|
9be7228247
|
Delay Dropbox polling by 5 seconds and dispatch only a single request
|
2014-08-14 13:48:23 +01:00 |
|
James Allen
|
670e8e5cb9
|
Use Dropbox Real-time polling
|
2014-08-13 17:26:18 +01:00 |
|
James Allen
|
b7ed3bab8f
|
Merge branch 'redis-queue'
|
2014-08-11 12:10:25 +01:00 |
|
James Allen
|
b20934e579
|
Merge branch 'master' of github.com:sharelatex/web-sharelatex
|
2014-08-08 11:42:02 +01:00 |
|
James Allen
|
10021986c5
|
Don't error on password reset if no email found, and translate error messages
|
2014-08-08 11:41:54 +01:00 |
|
Henry Oswald
|
66ba6e612d
|
Revert "send 401 when login fails"
This reverts commit fb901c6365d37654ba9058f57a71a4e60366688e.
|
2014-08-08 10:21:17 +01:00 |
|
Henry Oswald
|
7976f2f0fe
|
send 401 when login fails
|
2014-08-07 16:28:00 +01:00 |
|
James Allen
|
b367c4a968
|
Show group subscription status on subscription dashboard page
Conflicts:
app/views/subscriptions/dashboard.jade
|
2014-08-07 15:51:43 +01:00 |
|
James Allen
|
0a44aa9e71
|
Push into doc updater queue rather than pub/sub for updates
|
2014-08-07 13:19:10 +01:00 |
|
Henry Oswald
|
d047d44079
|
Changed the error messages which are sent down to the client to be translated first
fixed up tests from titles we check when rendering, deleted them as they never
catch anything important, more hastle than they are worth imo.
|
2014-08-01 14:03:38 +01:00 |
|
Henry Oswald
|
bf56e083cf
|
removed a load of console.logs
|
2014-07-25 13:14:19 +01:00 |
|
James Allen
|
1128b45b17
|
Add in system messages
|
2014-07-24 13:24:08 +01:00 |
|
Henry Oswald
|
17962426ea
|
blog returns 404's if the page does not exist in blog
|
2014-07-23 12:16:52 +01:00 |
|
James Allen
|
1c68ea7328
|
Don't care if user key has expired when we receive a cursor update
|
2014-07-21 13:16:07 +01:00 |
|
Henry Oswald
|
554fd7c7d0
|
change client connection timeout to 15 mins expire in redis
|
2014-07-17 16:03:53 +01:00 |
|
James Allen
|
37a12e88c1
|
Show who is online
|
2014-07-17 15:25:22 +01:00 |
|
James Allen
|
e0f1ed3c10
|
Use internal url for chat
|
2014-07-17 11:43:12 +01:00 |
|
Henry Oswald
|
abc4306e06
|
merge
|
2014-07-16 13:35:15 +01:00 |
|
James Allen
|
fce271f827
|
Fix unit tests
|
2014-07-16 12:01:15 +01:00 |
|
Henry Oswald
|
6982ec63ae
|
changed get template details to findOne
|
2014-07-16 11:56:22 +01:00 |
|
Henry Oswald
|
cd60817592
|
made getting templates details parallel
|
2014-07-16 11:37:17 +01:00 |
|
Henry Oswald
|
91ca726e66
|
get template details now includes the markdown description of the project
|
2014-07-16 11:27:47 +01:00 |
|
James Allen
|
2a3ff3c523
|
Fix unit tests
|
2014-07-15 18:33:59 +01:00 |
|
Henry Oswald
|
d39b8a0a05
|
fixed broken chat test
|
2014-07-15 14:28:39 +01:00 |
|
Henry Oswald
|
9f82e63a8f
|
changed :project_id to :Project_id
|
2014-07-14 22:11:41 +01:00 |
|
Henry Oswald
|
4a71b38721
|
added route for getting connected users
|
2014-07-14 16:16:01 +01:00 |
|
Henry Oswald
|
e6dfef6225
|
added getting connected users controller
|
2014-07-14 16:01:58 +01:00 |
|
Henry Oswald
|
b0cf0666fa
|
changed the redis stuf to multi
|
2014-07-14 15:38:55 +01:00 |
|
Henry Oswald
|
d13676dab2
|
cursor data is stored in redis
|
2014-07-14 15:30:55 +01:00 |
|
Henry Oswald
|
61b7bea203
|
added ttl to the users set to keep redis clean from inactive projects
|
2014-07-14 13:20:29 +01:00 |
|
Henry Oswald
|
13aaf042d9
|
connected user manager logic works correctly
|
2014-07-14 12:41:06 +01:00 |
|
Henry Oswald
|
d737197e95
|
marksUserAsDisconnected -> markUserAsDisconnected
|
2014-07-10 17:01:42 +01:00 |
|
Henry Oswald
|
01ad313133
|
hooked up editor controller to connected users manager
|
2014-07-10 17:01:19 +01:00 |
|
Henry Oswald
|
e1dd58aca8
|
fixed algolia settings and removed some console.logs
|
2014-07-10 16:05:18 +01:00 |
|
Henry Oswald
|
4ccc56723f
|
added disconnect funtion in connected users manager
|
2014-07-10 16:05:05 +01:00 |
|
Henry Oswald
|
c0a6f0b7ad
|
Merge branch 'master-redesign' into master-redesign-templates-and-blog
Conflicts:
public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee
public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee
public/coffee/ide/online-users/OnlineUsersManager.coffee
public/coffee/ide/track-changes/directives/infiniteScroll.coffee
|
2014-07-10 15:15:18 +01:00 |
|
Henry Oswald
|
1be8dadbcf
|
fixed chat tests
|
2014-07-10 15:12:28 +01:00 |
|
Henry Oswald
|
025d3147ec
|
blog intergration works
|
2014-07-10 14:53:53 +01:00 |
|
James Allen
|
6d10c186ad
|
Sort out escaping issues
|
2014-07-09 11:05:00 +01:00 |
|
James Allen
|
8c56a46594
|
Merge branch 'master' into master-redesign
|
2014-07-08 13:24:48 +01:00 |
|
James Allen
|
2553f51e44
|
Remove unused subscription downgrade logic
|
2014-07-08 12:55:29 +01:00 |
|
Henry Oswald
|
581d9ec925
|
- hooked up chat throughout the stack
- removed lots of console.logs
- working on the auto scrol, doesn't quite work yet
|
2014-07-08 10:08:38 +01:00 |
|
Henry Oswald
|
d1f907cee5
|
first simple version of tracking who is active in the editor
|
2014-07-04 16:18:46 +01:00 |
|
Henry Oswald
|
0d02241b46
|
linked chat into the editor real time contorller
|
2014-07-04 13:20:30 +01:00 |
|
Henry Oswald
|
9c35cfd693
|
very start of chat controllers done
|
2014-07-04 13:05:55 +01:00 |
|
Henry Oswald
|
77246b2a07
|
added query string support onto get requests for limit and before
|
2014-07-02 17:37:30 +01:00 |
|
Henry Oswald
|
8670b543b9
|
added basic chat handler
|
2014-07-02 17:28:05 +01:00 |
|
Henry Oswald
|
978e3262b5
|
added redirects from config file in, used for old template paths
|
2014-07-01 15:44:12 +01:00 |
|
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 |
|