Mike Chen
|
efad5632d8
|
set invisible instead of remove to preserve space of voting arrows when voting is disabled
|
2012-08-09 13:03:28 -04:00 |
|
David Ormsbee
|
b78c038bf2
|
Merge pull request #375 from MITx/dormsbee/new_jobs
Dormsbee/new jobs
|
2012-08-09 10:00:14 -07:00 |
|
Mike Chen
|
3ae1de5ed9
|
Merge branch 'master' of github.com:MITx/mitx into ccp0101/playground
|
2012-08-09 12:52:15 -04:00 |
|
Mike Chen
|
67ab56af6c
|
Merge branch 'brittany' of github.com:dementrock/mitx into ccp0101/playground
Conflicts:
lms/templates/discussion/_thread.html
|
2012-08-09 12:44:43 -04:00 |
|
Tom Giannattasio
|
3c23aca898
|
styled bulleted lists on jobs page
|
2012-08-09 12:26:32 -04:00 |
|
Tom Giannattasio
|
3d3ee02e52
|
started textbook nav styles
|
2012-08-09 12:16:13 -04:00 |
|
Mike Chen
|
46a7c51df5
|
remove voting arrows if one cannot vote
|
2012-08-09 12:12:43 -04:00 |
|
Mike Chen
|
b449334462
|
generate permanent link for thread/comment on client side
|
2012-08-09 12:04:38 -04:00 |
|
Tom Giannattasio
|
e82582e329
|
added course name to global nav bar
|
2012-08-09 11:17:26 -04:00 |
|
Tom Giannattasio
|
5c14a1ce65
|
added admin controls to main post and comments
|
2012-08-08 16:42:19 -04:00 |
|
Kyle Fiedler
|
971ec9891e
|
Added new selections styles
|
2012-08-08 16:27:48 -04:00 |
|
Kyle Fiedler
|
ccc1f1dfd5
|
Removed padding and added line-height for the tutorials
|
2012-08-08 16:27:48 -04:00 |
|
Kyle Fiedler
|
17d072711b
|
Make the sidebar links more standard, and remove some of their styling
|
2012-08-08 16:27:47 -04:00 |
|
Mike Chen
|
f4edc050d0
|
confirm before deleting comment/thread
|
2012-08-08 14:57:13 -04:00 |
|
Mike Chen
|
b06e31d2ed
|
fix Close Thread showing for students and empty bracket in search bar
|
2012-08-08 14:51:49 -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 |
|
Mike Chen
|
5e6261ebb1
|
courseware still not working..
|
2012-08-08 11:30:11 -04:00 |
|
Mike Chen
|
8627a5f33e
|
Merge branch 'master' of github.com:dementrock/mitx into ccp0101/moderation
|
2012-08-08 11:20:13 -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 |
|
Arjun Singh
|
d8a1b5d574
|
adding some styling so that the syllabus lists display reasonably
|
2012-08-08 02:59:15 -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 |
|