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 |
|
Prem Sichanugrist
|
fc4d4c8295
|
Fix section convention and code highlight
|
2012-05-31 13:24:24 -04:00 |
|
ichuang
|
7a27a97899
|
add "msg" output to textline
|
2012-05-27 21:12:54 -04:00 |
|
Lyla Fischer
|
75f5a1cfee
|
failed to actually test and find the missing colon
|
2012-03-27 09:51:27 -04:00 |
|
Lyla Fischer
|
64e187fdd4
|
fixed default handling
|
2012-03-27 09:44:27 -04:00 |
|
Lyla Fischer
|
ce5540b234
|
textine size addition
|
2012-03-27 09:35:22 -04:00 |
|
Calen Pennington
|
fdc5cd94a9
|
Move to subdirectory in prepartion for merge
|
2012-03-19 11:10:44 -04:00 |
|