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 |
|
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 |
|
Brittany Cheng
|
8df3ec3dae
|
Merge branch 'master' of github.com:dementrock/mitx into brittany
|
2012-08-07 16:42:45 -04:00 |
|
Rocky Duan
|
2685a3b637
|
trending tags
|
2012-08-07 16:41:01 -04:00 |
|
Brittany Cheng
|
a2f0e31d90
|
Merge branch 'master' of github.com:dementrock/mitx into brittany
|
2012-08-07 16:21:24 -04:00 |
|
Brittany Cheng
|
9ae21a878a
|
recent activity
|
2012-08-07 16:21:19 -04:00 |
|
Rocky Duan
|
fddee7defa
|
Merge branch 'brittany' of github.com:dementrock/mitx
Conflicts:
lms/templates/discussion/_recent_active_posts.html
|
2012-08-07 16:19:10 -04:00 |
|
Brittany Cheng
|
d934142adf
|
Merge branch 'master' of github.com:dementrock/mitx into brittany
|
2012-08-07 16:16:32 -04:00 |
|
Rocky Duan
|
7ba3bdfd61
|
show recently active posts user's following
|
2012-08-07 16:16:23 -04:00 |
|
Rocky Duan
|
6023aca559
|
scaffold for trending tags
|
2012-08-07 16:15:43 -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
|
e1a564108b
|
Merge branch 'master' of github.com:dementrock/mitx into brittany
|
2012-08-07 15:41:29 -04:00 |
|
Rocky Duan
|
5309592f01
|
scaffold for recent active posts
|
2012-08-07 15:40:36 -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 |
|
Brittany Cheng
|
4b9358fb72
|
similar posts styles
|
2012-08-07 11:55:31 -04:00 |
|
Rocky Duan
|
0863e34619
|
display actual username
|
2012-08-07 11:40:58 -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
|
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
|
77900bd761
|
simple blank slate
|
2012-08-06 23:17:38 -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 |
|
Rocky Duan
|
0ae68e7324
|
Merge branch 'master' of github.com:MITx/mitx into merge
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/course_navigation.html
|
2012-08-06 22:38:31 -04:00 |
|
Rocky Duan
|
5679b0da5d
|
sort by activity
|
2012-08-06 22:25:15 -04:00 |
|
Rocky Duan
|
c2e2cd40a4
|
fixed display mode single character bug
|
2012-08-06 22:21:10 -04:00 |
|
Rocky Duan
|
d33ddec470
|
fixed multiple renderer bug
|
2012-08-06 22:20:56 -04:00 |
|
Rocky Duan
|
fe02d04f07
|
use raw title
|
2012-08-06 21:46:33 -04:00 |
|
Rocky Duan
|
bd4a386d93
|
highlighting while skipping code and mathjax (ugly and slow solution)
|
2012-08-06 21:43:43 -04:00 |
|
kimth
|
0940a3cc83
|
Merge pull request #352 from MITx/kimth/lms-coderesponse
Don't contact queueing server on Django load
|
2012-08-06 16:09:56 -07:00 |
|