ichuang
|
9b90068e03
|
Merge branch 'stable-edx4edx' of github.com:MITx/mitx
Conflicts:
common/lib/xmodule/seq_module.py
common/lib/xmodule/xmodule/capa_module.py
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
lms/djangoapps/multicourse/multicourse_settings.py
|
2012-07-08 16:52:36 -04:00 |
|
Calen Pennington
|
de07b8b345
|
Begin using a Keystore for XML parsing. Still broken: sequence icons, custom tags, problems, video js
|
2012-06-29 12:40:50 -04:00 |
|
ichuang
|
caa14922bb
|
edx4edx configuration running on content server. Notes:
- django debug commented out in lms/envs/dev.py (temporarily - need cleanup)
- email backend set
- index page modified for edx4edx
|
2012-06-26 14:04:56 +00:00 |
|
Calen Pennington
|
5404345b1f
|
Make tests pass when running on cms
|
2012-06-18 13:21:06 -04:00 |
|
Calen Pennington
|
5ba03130aa
|
Moving LMS code into subdirectory
|
2012-06-06 14:09:01 -04:00 |
|