Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,879 Commits 1 Branch 0 Tags
32c50090eb9e07d24ef690bd69f250f0893e6d2b
Commit Graph

207 Commits

Author SHA1 Message Date
Reda Lemeden
d6fbda39b4 Added comments to Askbot stylesheets 2012-05-17 16:56:34 -04:00
Kyle Fiedler
ba8fb95d72 added fix for lists in updates 2012-05-17 16:55:44 -04:00
pmitros
3632f6a748 Merge pull request #49 from MITx/specific-error-handling 
Specific error handling
 2012-05-17 13:43:13 -07:00
Prem Sichanugrist
5c82af3a5c Update files after use guard to compile sources 2012-05-17 15:41:47 -04:00
Prem Sichanugrist
0a97979a0e Add Guard to aid sass/coffeescript compilation 
You can run this by do:

    bundle install (first time only)
    bundle exec guard
 2012-05-17 15:41:43 -04:00
Galen Frechette
cb8224cbcd cleans up visual style of accordion and sidebar links and fixes border alignment issues 2012-05-17 11:47:28 -04:00
Calen Pennington
f30596c499 Merge branch 'master' into specific-error-handling 
Conflicts:
	djangoapps/courseware/views.py
 2012-05-17 11:39:21 -04:00
Galen Frechette
2bb7a77d01 changes the border and box-shadow of headings in courseware content so bottom border is not hidden 2012-05-17 09:08:51 -04:00
Galen Frechette
1652ec38de changes text color of highlited section in courseware index from red to black 2012-05-17 09:06:16 -04:00
Galen Frechette
2d7e36b409 improves communication of current selection in the courseware index sidebar 2012-05-17 09:06:16 -04:00
Galen Frechette
2b4437c951 handles the case of no title or sub title in the courseware index links 2012-05-17 09:06:16 -04:00
Galen Frechette
12eb7cf6f3 wip more defined week headings 2012-05-17 09:06:15 -04:00
Galen Frechette
825cf0e03e wip better communication of current page in course ware 2012-05-17 09:06:15 -04:00
Isaac Chuang
ad44882835 Ike's changes to enable multicourse, new response types, etc. 2012-05-16 21:18:47 -04:00
Kyle Fiedler
e45eb9fbe1 minor fixes for IE bugs 2012-05-16 17:16:40 -04:00
Edward Loveall
5148746d0a Fixes border radius overflow issue on course content wrapper 2012-05-16 14:48:53 -04:00
Calen Pennington
69321b4497 Display the appropriate type of error message depending on the type of the incoming request 2012-05-16 13:45:00 -04:00
Calen Pennington
698d0a167e Display specific error messages when parts of the courseware break, rather than returning a 500 indicating that the whole site is down 2012-05-16 11:46:09 -04:00
Kyle Fiedler
1e8ab2240e Added msising marketing files 2012-05-16 11:05:23 -04:00
Kyle Fiedler
b17d83a459 Cleaned up unused functions now in bourbon and unused variables 2012-05-16 10:45:31 -04:00
Kyle Fiedler
60bd63a594 Removed print.scss, moved index to marketing, started to alphabatize 2012-05-15 16:55:53 -04:00
Galen Frechette
d0a7326738 refactors some of the sequence nav styles 2012-05-15 16:34:21 -04:00
Galen Frechette
709faa4718 makes the sequence nav more semantic and replaces js hover with css 2012-05-15 16:00:27 -04:00
Kyle Fiedler
2d75118592 Added nav for sidebar links 2012-05-14 16:41:39 -04:00
Kyle Fiedler
89afc98f76 Made links in sidebar all in p> 2012-05-14 16:39:44 -04:00
Isaac Chuang
8989605cba Moving in Ike's new files, touches of multicourse 2012-05-13 20:33:29 -04:00
Isaac Chuang
232e758c7a Integrating some of Ike's courseware changes 2012-05-13 19:36:01 -04:00
Lyla Fischer
72dee8ba14 merge with master 2012-05-11 13:17:52 -04:00
ichuang
1494cbbd85 Merged root URL prefix from Ike. Errors should be attributed to pmitros. 2012-05-10 23:17:34 -04:00
Lyla Fischer
a4dae57751 merge with master 2012-05-10 12:25:33 -04:00
Calen Pennington
5011f60d45 Merge branch 'master' into anonymous_user 
Conflicts:
	djangoapps/courseware/module_render.py
	djangoapps/courseware/modules/capa_module.py
 2012-05-10 09:17:26 -04:00
pmitros
c1b255fdf3 Merge pull request #18 from MITx/grade-refactor 
Grade refactor
 2012-05-09 15:00:25 -07:00
Reda Lemeden
3847dee605 Added official badge styling to staff questions 2012-05-09 15:30:12 -04:00
David Ormsbee
8bd00b34ed Merge pull request #37 from MITx/faq_addition 
added questions to faq
 2012-05-09 09:46:55 -07:00
Lyla Fischer
8ad1d3e17d added questions to faq 2012-05-09 12:31:55 -04:00
Kyle Fiedler
29dd45e517 Fix styles for play button 2012-05-08 14:43:49 -04:00
Kyle Fiedler
e0a313e36b added more layout to amplifier 2012-05-08 14:13:30 -04:00
Prem Sichanugrist
ecf0126fce Make the accordian expand 'Week 1' by default 
This fixes the regression from javascript rewrite.
 2012-05-08 14:13:29 -04:00
Prem Sichanugrist
07629ef45d Rewrite Courseware navigation 2012-05-08 14:13:29 -04:00
Prem Sichanugrist
80aeaed5fe Rewrite JavaScript on main page 
Both feedback form and calculator interaction now in its own class.
 2012-05-08 14:13:29 -04:00
Prem Sichanugrist
43a6534e75 Add Jasmine to do a JavaScript unit test 2012-05-08 14:13:29 -04:00
Kyle Fiedler
171d40270f Fixed some of the minor css bugs 2012-05-08 14:13:29 -04:00
Kyle Fiedler
edec1b5558 added styles for tutorial headers and removing extra padding on bottom sequence nav 2012-05-08 14:13:28 -04:00
Piotr Mitros
f9adfdbb50 Videos now support annotations w/o verticals 2012-05-08 14:13:28 -04:00
David Ormsbee
e02081b043 tiny bump in querystring call to CSS to make sure clients see updates 2012-05-08 14:13:27 -04:00
Bridger Maxwell
aae0820238 Removed python code in templates to be javascript. 2012-05-08 14:13:27 -04:00
Bridger Maxwell
7f069ac2ce Made sure that histogram graph doesn't show up for modules without scores. Modified look of histogram graph. 2012-05-08 14:13:27 -04:00
Bridger Maxwell
752a625237 Added histogram graph for courseware administrators. 2012-05-08 14:13:27 -04:00
Calen Pennington
6b10c0760b Merge branch 'master' into anonymous_user 
Conflicts:
	djangoapps/student/views.py
 2012-05-08 13:54:57 -04:00
Lyla Fischer
eb95ea9e2f Merge branch 'master' into MC 2012-05-07 22:17:37 -04:00