Commit Graph

23 Commits

Author SHA1 Message Date
Calen Pennington
02bb23f46a Minor formatting cleanup 2012-05-15 10:55:57 -04:00
Piotr Mitros
85079da3a7 Minor bug fix/conflict between grades and i4xsystem 2012-05-12 15:03:20 -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
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
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
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
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
Calen Pennington
49f402e3e7 Remove debug print statements 2012-05-07 14:56:27 -04:00
Piotr Mitros
ddcf68362a Videos now support annotations w/o verticals 2012-05-07 10:42:48 -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
Lyla Fischer
e49fd7002d respones to code review 2012-04-13 14:34:09 -04:00
Lyla Fischer
abee617622 check button and "we already started" announcement
Changed the format of the check/submit button so that the exam
submission makes more sense; added a disclaimer to the enrollment
number so that new students know that they will be disadvantaged.
2012-04-05 14:18:22 -04:00
Piotr Mitros
1c5945db9c Fixed bug with showing answers related to complex numbers 2012-03-29 14:46:53 -04:00
Calen Pennington
1bc3835fe6 Splitting files into subdirectories in preparation for merge 2012-03-19 11:10:44 -04:00