Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

2939 Commits

Author SHA1 Message Date
Rocky Duan
04387289fa fixed bugs caused by merging 2012-08-14 13:43:04 -07:00
Tom Giannattasio
a58a047582 moved global nav class 2012-08-14 16:12:36 -04:00
Tom Giannattasio
5aefda8d51 modified zebra stripes 2012-08-14 16:09:32 -04:00
Tom Giannattasio
dd92f51f02 added fluid widths 2012-08-14 16:09:32 -04:00
Tom Giannattasio
d673895eaa added drag functionality 2012-08-14 16:09:32 -04:00
Tom Giannattasio
defa5b3159 basic gradebook template built; basic scroll functionality built 2012-08-14 16:09:32 -04:00
Tom Giannattasio
9871050f94 started gradebook 2012-08-14 16:09:32 -04:00
Rocky Duan
eb47093b1c Merge branch 'master' of github.com:MITx/mitx into merge 
Conflicts:
	common/djangoapps/student/models.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-14 12:54:43 -07:00
Rocky Duan
49e840d62b adjust new post button in forum view 2012-08-14 12:43:15 -07:00
Rocky Duan
38bdcabe53 reply now works again 2012-08-13 23:23:13 -07:00
Rocky Duan
0fa0f2c8ae add cancel button for new post 2012-08-13 21:15:04 -07:00
Calen Pennington
a7b88550c7 Merge pull request #401 from MITx/feature/kfiedler/courseware-style 
Added tooltip styles, made all buttons the same, and other small changes...
 2012-08-13 12:29:48 -07:00
Kyle Fiedler
731f1cd7a8 Added tooltip styles, made all buttons the same, and other small changes throughout the courseware 2012-08-13 15:05:43 -04:00
Tom Giannattasio
ee0cbf66f9 added a cleaner arrow implementation 2012-08-13 10:19:06 -04: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
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
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
Tom Giannattasio
ced521c17d cleaned up textbook nav styles 2012-08-09 14:44:50 -04:00
Tom Giannattasio
3d3ee02e52 started textbook nav styles 2012-08-09 12:16:13 -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
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
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
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
Brittany Cheng
391d173018 similar posts styles 2012-08-07 12:05:01 -04:00