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 |
|
ichuang
|
f99eb930ac
|
new static/admin files for django 1.4 admin
|
2012-08-10 15:25:42 -04:00 |
|
Calen Pennington
|
310788ca08
|
Merge pull request #384 from MITx/feature/tomg/fall-design
fixed course name title bar bug
|
2012-08-10 10:05:59 -07:00 |
|
Tom Giannattasio
|
538185173a
|
added truncation for super long titles
|
2012-08-10 11:48:07 -04:00 |
|
Tom Giannattasio
|
022c65a6b4
|
fixed class name header bug
|
2012-08-10 11:40:16 -04:00 |
|
Calen Pennington
|
1f1a87d970
|
Merge pull request #379 from MITx/feature/victor/keep-accordion-state
Make accordion remember state
|
2012-08-10 07:15:57 -07:00 |
|
Victor Shnayder
|
1c3038ff3a
|
Make accordion remember state
* use url_name to compare to passed params
* remove unused fields from template context
* Also make it possible to link to a chapter
|
2012-08-09 19:47:08 -04:00 |
|
Mike Chen
|
2a9bf1a115
|
Merge branch 'master' of github.com:MITx/mitx into ccp0101/playground
|
2012-08-09 14:46:01 -04:00 |
|
Tom Giannattasio
|
ced521c17d
|
cleaned up textbook nav styles
|
2012-08-09 14:44:50 -04:00 |
|
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 |
|