ichuang
079166a4c5
Merge branch 'dogfood' of github.com:MITx/mitx into dogfood
...
Conflicts:
templates/mathjax_include.html
2012-06-05 21:44:08 -04:00
ichuang
71db490a10
added MITX_FEATURES['USE_DJANGO_PIPELINE'] to env.common, fix main.html accordingly
2012-06-05 21:41:39 -04:00
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
68a2e7c079
dynamic math display - fix sequence of mathjax timing (mathml now
...
generated when Check is clicked)
2012-06-02 17:08:53 -04:00
ichuang
e17668540f
dynamic math - changes to javascript, responsetypes, and inputtypes
...
main.html now includes mathjax_include for all mathjax stuff
problem.js refreshes mathjax formulas on change
all previous *_fromjs renamed to *_dynamath, eg textline_dynamath
2012-06-01 22:39:50 -04:00
ichuang
da64a16c23
cleaned up cruft in mathjax_include.html
2012-05-17 22:54:38 -04:00
ichuang
a76248251a
fix quickedit (request.user_is_staff is not a function); small edit to problem.html
...
to show quickedit when settings.QUICKEDIT is True. add
mathjax_include.html because that is needed by quickedit.html
2012-05-17 22:48:39 -04:00
