Rocky Duan
|
6fa0298546
|
make retrieved single thread/comment after update integrated with permissions
|
2012-08-13 21:42:28 -07:00 |
|
Rocky Duan
|
0fa0f2c8ae
|
add cancel button for new post
|
2012-08-13 21:15:04 -07:00 |
|
Rocky Duan
|
12897ffff0
|
added title & tag for new post & fixed error handling; reply button in generated thread doesn't work
|
2012-08-12 22:54:02 -07:00 |
|
Rocky Duan
|
44f7b37bfb
|
refactored comment_client working
|
2012-08-12 12:56:55 -07:00 |
|
Rocky Duan
|
7030d1f1a2
|
fixed endorse&edit&delete
|
2012-08-11 14:38:37 -07:00 |
|
Rocky Duan
|
2f469f0f29
|
Merge branch 'brittany' of github.com:dementrock/mitx into mergedtom
|
2012-08-10 18:51:18 -07:00 |
|
Brittany Cheng
|
78ca885b05
|
fix comment styles
|
2012-08-10 18:42:07 -07:00 |
|
Rocky Duan
|
66beb54739
|
Merge branch 'brittany' of github.com:dementrock/mitx into lol
|
2012-08-10 17:59:28 -07:00 |
|
Rocky Duan
|
ab6cf914a0
|
Merge branch 'brittany' of github.com:dementrock/mitx into lol
Conflicts:
lms/templates/discussion/_thread.html
|
2012-08-10 17:59:19 -07:00 |
|
Brittany Cheng
|
5b6e3997af
|
fixed ul courseware
|
2012-08-10 17:58:18 -07:00 |
|
Brittany Cheng
|
f44358ab78
|
merge tom's styles
|
2012-08-10 17:52:07 -07:00 |
|
Tom Giannattasio
|
5c14a1ce65
|
added admin controls to main post and comments
|
2012-08-08 16:42:19 -04:00 |
|
Tom Giannattasio
|
9b9bb22cda
|
tightened white space; fixed double margin in comments
|
2012-08-08 14:36:19 -04:00 |
|
Brittany Cheng
|
3ec658df56
|
merge tom's styles, warning: LOTS OF STUFF BROKE
|
2012-08-08 12:45:40 -04:00 |
|
Tom Giannattasio
|
dc5b8b51c4
|
placeholder and button color updates
|
2012-08-08 11:08:58 -04:00 |
|
Tom Giannattasio
|
10ff6af3bb
|
discussion sidebar additions; inline text editor example
|
2012-08-08 10:56:59 -04:00 |
|
Rocky Duan
|
f3d44225cc
|
Merge branch 'brittany' of github.com:dementrock/mitx into brittany
|
2012-08-07 18:51:18 -04:00 |
|
Rocky Duan
|
2fb02f1a73
|
Merge branch 'master' of github.com:MITx/mitx into merge
Conflicts:
lms/urls.py
|
2012-08-07 16:58:14 -04:00 |
|
Brittany Cheng
|
1f1ea8ad5e
|
left nav styles
|
2012-08-07 16:56:53 -04:00 |
|
Brittany Cheng
|
0fba4d9848
|
left nav styles
|
2012-08-07 16:54:13 -04:00 |
|
Brittany Cheng
|
67777ef5a2
|
left nav styles
|
2012-08-07 16:52:32 -04:00 |
|
Rocky Duan
|
272c7b8b0c
|
Merge branch 'master' into merge
|
2012-08-07 16:49:54 -04:00 |
|
Brittany Cheng
|
9ae21a878a
|
recent activity
|
2012-08-07 16:21:19 -04:00 |
|
Brittany Cheng
|
338a6788c8
|
recent activity
|
2012-08-07 16:11:24 -04:00 |
|
Tom Giannattasio
|
d6e969a8c0
|
added collapsed state for text editor
|
2012-08-07 15:46:18 -04:00 |
|
Brittany Cheng
|
39dc6a63da
|
cleanup css
|
2012-08-07 14:41:28 -04:00 |
|
Tom Giannattasio
|
6295bc3bc5
|
label font changes
|
2012-08-07 14:41:20 -04:00 |
|
Brittany Cheng
|
ed8595ad95
|
error styles
|
2012-08-07 14:31:04 -04:00 |
|
Tom Giannattasio
|
8c366e2d59
|
tweaking the text editor
|
2012-08-07 14:25:05 -04:00 |
|
Brittany Cheng
|
7962813014
|
info styles
|
2012-08-07 13:53:57 -04:00 |
|
Brittany Cheng
|
49840933c0
|
error handling
|
2012-08-07 13:48:43 -04:00 |
|
Rocky Duan
|
dbb467365b
|
fixed error field for new post
|
2012-08-07 12:08:38 -04:00 |
|
Rocky Duan
|
aeb2d73cba
|
Merge branch 'discussion3' of github.com:dementrock/mitx
|
2012-08-07 12:05:52 -04:00 |
|
Rocky Duan
|
a9b171c81f
|
Merge branch 'discussion3' of github.com:dementrock/mitx
Conflicts:
lms/static/coffee/src/discussion/templates.coffee
|
2012-08-07 12:05:46 -04:00 |
|
Brittany Cheng
|
391d173018
|
similar posts styles
|
2012-08-07 12:05:01 -04:00 |
|
Rocky Duan
|
0560bb7eb7
|
add hide similar post button
|
2012-08-07 12:03:41 -04:00 |
|
Tom Giannattasio
|
d5302a0bd0
|
thread updates: follow/unfollow, grid tweaks
|
2012-08-07 12:00:17 -04:00 |
|
Kyle Fiedler
|
dd6ec19e80
|
Make the modal window work in the courseware
|
2012-08-07 11:59:49 -04:00 |
|
Brittany Cheng
|
4b9358fb72
|
similar posts styles
|
2012-08-07 11:55:31 -04:00 |
|
Brittany Cheng
|
5bec964606
|
Merge branch 'master' of github.com:dementrock/mitx into discussion3
|
2012-08-07 11:36:34 -04:00 |
|
Rocky Duan
|
547114a823
|
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation
|
2012-08-07 11:31:26 -04:00 |
|
Rocky Duan
|
6c2f53a495
|
to make it appear at least normal..
|
2012-08-07 11:28:52 -04:00 |
|
Tom Giannattasio
|
00a72cf86a
|
updated thread styles: voting, actions, comments, sort
|
2012-08-07 11:27:13 -04:00 |
|
Rocky Duan
|
25c05e702e
|
Merge branch 'brittany' of github.com:dementrock/mitx
|
2012-08-07 11:23:19 -04:00 |
|
Rocky Duan
|
0c311b8f13
|
search for similar posts without any styling..
|
2012-08-07 11:22:41 -04:00 |
|
Brittany Cheng
|
1fb0e352b4
|
blank slate
|
2012-08-07 11:10:24 -04:00 |
|
Tom Giannattasio
|
2135ed5015
|
added vote arrows
|
2012-08-07 10:16:08 -04:00 |
|
Brittany Cheng
|
87019c4bcb
|
Merge branch 'master' of github.com:dementrock/mitx into discussion3
|
2012-08-07 10:07:30 -04:00 |
|
Rocky Duan
|
42cab65903
|
make behavior consistent with normal mathjax
|
2012-08-06 23:05:05 -04:00 |
|
Rocky Duan
|
26a80f2d9b
|
fixed escape recovering bug
|
2012-08-06 23:00:38 -04:00 |
|