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
|
ff7b7cdd20
|
Fix smoke tests
|
2014-07-08 14:29:06 +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 |
|