James Allen
|
1128b45b17
|
Add in system messages
|
2014-07-24 13:24:08 +01:00 |
|
James Allen
|
fbd36d8b07
|
Sort of style of admin panel and trim functionality
|
2014-07-24 11:22:22 +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 |
|
Henry Oswald
|
83b94f987c
|
cleaned up few small things with templates
|
2014-07-23 12:16:31 +01:00 |
|
Henry Oswald
|
a4b02558dc
|
'carded' the templates page, top search area still needs doing
|
2014-07-22 17:24:32 +01:00 |
|
Henry Oswald
|
46027128a4
|
change notifications email top header to the grey we use on the site
|
2014-07-21 15:52:55 +01:00 |
|
Henry Oswald
|
1322f3e183
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-21 14:18:43 +01:00 |
|
Henry Oswald
|
375669cd3b
|
changed emails to adams design. Does not render brilliantly in gmail, but overall not bad.
|
2014-07-21 14:18:11 +01:00 |
|
James Allen
|
a3a5aa1c0d
|
Remove server-side santization of project name, it's all escaped client side now
|
2014-07-21 13:34:25 +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
|
f4b0dec1b8
|
changed api-key to read-only-api-key for angolia
|
2014-07-16 16:37:58 +01:00 |
|
Henry Oswald
|
abc4306e06
|
merge
|
2014-07-16 13:35: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 |
|
James Allen
|
8f08823d34
|
Sort out fingerprints and pdf.js worker path
|
2014-07-16 11:28:52 +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
|
b9f2b02594
|
Sort out scroll in chat
|
2014-07-15 18:25:12 +01:00 |
|
Henry Oswald
|
9f82e63a8f
|
changed :project_id to :Project_id
|
2014-07-14 22:11:41 +01:00 |
|
Henry Oswald
|
0aa6a206e7
|
added name and email to connected user data and example get request for chat
|
2014-07-14 16:23:31 +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
|
2b2b995340
|
refactored updateClientPosition to use async
|
2014-07-14 12:58:55 +01:00 |
|
Henry Oswald
|
5093820a5f
|
Merge branch 'master-redesign' into master-redesign-templates-and-blog
|
2014-07-14 12:42:03 +01:00 |
|
Henry Oswald
|
13aaf042d9
|
connected user manager logic works correctly
|
2014-07-14 12:41:06 +01:00 |
|
James Allen
|
e4d9d03f55
|
Improve feedback on login/register forms
|
2014-07-11 17:08:19 +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
|
025d3147ec
|
blog intergration works
|
2014-07-10 14:53:53 +01:00 |
|
Henry Oswald
|
5cf756969e
|
blog wip
|
2014-07-09 19:49:39 +01:00 |
|
James Allen
|
16e382bef2
|
Update Ace and fix autocomplete
|
2014-07-09 17:59:04 +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
|
6dc9d32104
|
Merge branch 'master-redesign' into master-redesign-templates-and-blog
Conflicts:
public/coffee/app/main.coffee
|
2014-07-08 11:14:56 +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 |
|
James Allen
|
068d88ec0b
|
Style bonus page
|
2014-07-07 15:54:40 +01:00 |
|
James Allen
|
452098ca68
|
Redirect to register if not registered on plans page
|
2014-07-07 14:05:07 +01:00 |
|
James Allen
|
7947eb28ad
|
Remove ab test from plans page
|
2014-07-07 12:30:19 +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
|
de010cf971
|
added error logging
|
2014-07-04 13:29:59 +01:00 |
|
Henry Oswald
|
0d02241b46
|
linked chat into the editor real time contorller
|
2014-07-04 13:20:30 +01:00 |
|