Commit Graph

23 Commits

Author SHA1 Message Date
Calen Pennington
431704ac88 Make courseware work with multicourse disabled 2012-05-21 12:59:51 -04:00
ichuang
5e8fbcdc8d fix multicourse; fix bug in I4xSystem - self.filestore not set when
filestore not None.  mitxhome.html now properly automatically lists
all courses given in settings.COURSE_SETTINGS.  mitxhome now served
from multicourse.views.  optioninput.html was missing; fixed. cleaned
up access to request.session for coursename in courseware/views.py
2012-05-17 22:29:45 -04:00
Piotr Mitros
cad13b30a1 Passing i4x system deeper into capa_problem 2012-05-17 15:37:08 -04:00
Isaac Chuang
ad44882835 Ike's changes to enable multicourse, new response types, etc. 2012-05-16 21:18:47 -04:00
Piotr Mitros
85079da3a7 Minor bug fix/conflict between grades and i4xsystem 2012-05-12 15:03:20 -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
ichuang
cd78267056 Update djangoapps/courseware/module_render.py 2012-05-10 23:24:11 -03: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
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
eb95ea9e2f Merge branch 'master' into MC 2012-05-07 22:17:37 -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
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
8ecb979339 Cleaning up imports 2012-04-30 14:36:16 -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
Piotr Mitros
8c0503d33c Added comments 2012-04-10 08:10:52 -04:00
Piotr Mitros
c06c6104ca Grading histogram 2012-04-10 08:03:26 -04:00
Calen Pennington
1bc3835fe6 Splitting files into subdirectories in preparation for merge 2012-03-19 11:10:44 -04:00