Calen Pennington
|
8575ed439d
|
Merge branch 'master' into dogfood
Conflicts:
djangoapps/courseware/capa/responsetypes.py
djangoapps/courseware/module_render.py
djangoapps/courseware/modules/html_module.py
djangoapps/courseware/modules/seq_module.py
djangoapps/courseware/modules/x_module.py
djangoapps/courseware/views.py
templates/main.html
templates/problem.js
templates/textbox.html
|
2012-06-05 14:38:49 -04:00 |
|
ichuang
|
7fbc4d7f4f
|
removed django.settings imports from modules/* ; changed debug prints
to use logging; added DEBUG attr to XModule class
|
2012-06-01 13:49:19 -04:00 |
|
Piotr Mitros
|
98d8f4b55b
|
Unstable commit; syncing computers
|
2012-05-31 21:12:08 -04:00 |
|
Piotr Mitros
|
34dc32e5aa
|
Unstable state; need to merge from master
|
2012-05-31 13:44:45 -04:00 |
|
ichuang
|
41a539ed1f
|
html_module should render_to_string from namespace "course", not "main"
|
2012-05-27 20:07:38 -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
|
1bc3835fe6
|
Splitting files into subdirectories in preparation for merge
|
2012-03-19 11:10:44 -04:00 |
|