Commit Graph

93 Commits

Author SHA1 Message Date
Isaac Chuang
232e758c7a Integrating some of Ike's courseware changes 2012-05-13 19:36:01 -04:00
Piotr Mitros
756dc97897 Moved grading code from init to grades.py to fix existing scripts 2012-05-12 17:16:36 -04:00
Piotr Mitros
095043ca8b Custom response gives poor errors when there is no checker code 2012-05-12 15:16:29 -04:00
Piotr Mitros
85079da3a7 Minor bug fix/conflict between grades and i4xsystem 2012-05-12 15:03:20 -04:00
Isaac Chuang
747105e328 More minor cleanups 2012-05-11 17:05:14 -04:00
Isaac Chuang
668062a19b Minor cleanups to capa_module (comments, formatting, etc.) 2012-05-11 17:02:06 -04:00
Lyla Fischer
72dee8ba14 merge with master 2012-05-11 13:17:52 -04:00
Lyla Fischer
a0201f37a0 names not required 2012-05-11 12:31:59 -04:00
Piotr Mitros
98f19470f0 Fixed bad merge between Cale and Piotr/I4xSystem missing reference 2012-05-11 07:45:02 -04:00
ichuang
1494cbbd85 Merged root URL prefix from Ike. Errors should be attributed to pmitros. 2012-05-10 23:17:34 -04:00
ichuang
cd78267056 Update djangoapps/courseware/module_render.py 2012-05-10 23:24:11 -03:00
pmitros
de4e22a344 Merge pull request #39 from MITx/ps-fix-reset-answer
Do not double-append the XML path in caps module
2012-05-10 16:32:05 -07:00
Prem Sichanugrist
d879db5e10 Do not double-append the XML path in caps module
This fixes the bug in answers reset feature
2012-05-10 19:08:51 -04:00
Lyla Fischer
a4dae57751 merge with master 2012-05-10 12:25:33 -04:00
Lyla Fischer
7f92606ec9 responses to code review 2012-05-10 10:38:06 -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
Piotr Mitros
f511a5e0dd Changed parameters from **args based on code review 2012-05-09 17:37:54 -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
4c0cc81d82 added tests 2012-05-07 23:05:31 -04:00
Lyla Fischer
ca89ce73ab fixed mysterious problem rendering issue 2012-05-07 22:19:03 -04:00
Lyla Fischer
eb95ea9e2f Merge branch 'master' into MC 2012-05-07 22:17:37 -04:00
Piotr Mitros
f187a9e312 Capa no longer requires local filestore 2012-05-07 21:24:40 -04:00
Lyla Fischer
13a095fc1e checkboxes 2012-05-07 21:04:10 -04:00
Piotr Mitros
aab9b15cd4 Refactor for reusability: x_modules take common parameters as an object. capa_problem to take a file object and not filename. 2012-05-07 20:59:08 -04:00
Piotr Mitros
e1ac5e9f30 Moved extra settings into state. Added fs module for aux content 2012-05-07 20:13:30 -04:00
Prem Sichanugrist
a39c2c194d Rewrite Courseware navigation 2012-05-07 18:01:21 -04:00
Calen Pennington
1bd608e598 Make showanswer and rerandomize propogate downwards in course.xml 2012-05-07 15:36:13 -04:00
Calen Pennington
49f402e3e7 Remove debug print statements 2012-05-07 14:56:27 -04:00
Calen Pennington
47c832647c Call user_groups even for anonymous users 2012-05-07 14:56:17 -04:00
Piotr Mitros
ddcf68362a Videos now support annotations w/o verticals 2012-05-07 10:42:48 -04:00
pmitros
3cddaa4619 Merge pull request #19 from MITx/pmitros/histogram
Draws histogram for scores
2012-05-07 06:59:04 -07:00
Lyla Fischer
1f7a3f83b9 fixed naming convention on response types 2012-05-01 04:15:55 -04:00
Calen Pennington
0871d95f98 Allow anonymous user access to the site. Requires guest_courses.xml and info/guest_updates.html to be set created in the data repository 2012-04-30 15:18:47 -04:00
Calen Pennington
58731a1c3a Add a showanswer='always' option 2012-04-30 14:38:01 -04:00
Calen Pennington
faf0782d60 If rerandomize won't show different values, don't show the reset button 2012-04-30 14:37:39 -04:00
Calen Pennington
8ecb979339 Cleaning up imports 2012-04-30 14:36:16 -04:00
Calen Pennington
e6015eb9e7 Make showanswer and rerandomize propogate downwards in course.xml 2012-04-30 14:30:48 -04:00
Lyla Fischer
59493ed090 multiple choice 2012-04-28 06:51:14 -04:00
Piotr Mitros
fd3e571478 Took out print 2012-04-24 18:42:13 -04:00
Piotr Mitros
58a0a7d0d6 Case sensitivity bug fix 2012-04-24 18:27:54 -04:00
Bridger Maxwell
e9247920af Moved potential failure outside of unrelated try/catch block that would have masked the missing settings.DATA_DIR 2012-04-17 18:28:59 -04:00
Bridger Maxwell
f987f99a06 Changed CourseGrader to be an abstract base class. 2012-04-17 18:17:43 -04:00
Bridger Maxwell
9ee09ec93a Put graders into their own file. Incorporated other feedback from pull request. 2012-04-17 18:07:56 -04:00
Bridger Maxwell
e780e4d87e Put in precaution to be sure that any problems with a possible score of 0 are not graded. 2012-04-17 11:53:11 -04:00
Bridger Maxwell
da3424f67a Fixed zero-score-possible bug. 2012-04-17 11:45:24 -04:00
Bridger Maxwell
b2891273b5 Made sure that histogram graph doesn't show up for modules without scores. Modified look of histogram graph. 2012-04-17 00:40:29 -04:00
Bridger Maxwell
386835153b Added histogram graph for courseware administrators. 2012-04-17 00:17:12 -04:00
Bridger Maxwell
3e293f2a3d Merge branch 'master' into grade-refactor 2012-04-16 22:17:45 -04:00
Bridger Maxwell
a763edab40 Just a bit of cleanup. No code changes 2012-04-16 22:15:58 -04:00