Calen Pennington
|
8481937f59
|
Move Logger and *withPrefix javascript into a common location
|
2012-07-24 16:14:03 -04:00 |
|
Calen Pennington
|
66f79251dc
|
Add feature flag for disabling course start dates
|
2012-07-24 13:22:50 -04:00 |
|
Bridger Maxwell
|
60da23042f
|
Adding a setting to disable the wiki in deployment.
|
2012-07-13 13:36:38 -04:00 |
|
Calen Pennington
|
fdd9663699
|
Merge remote-tracking branch 'origin/master' into dormsbee/multicourse
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/modulestore/xml.py
lms/djangoapps/courseware/views.py
lms/templates/index.html
lms/templates/info.html
lms/templates/main.html
lms/templates/navigation.html
requirements.txt
|
2012-07-10 13:39:19 -04:00 |
|
Matthew Mongeau
|
949efb62e9
|
Got courses page working... mostly.
|
2012-07-09 11:27:45 -04:00 |
|
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 |
|
Matthew Mongeau
|
5109253378
|
Revert "workarounds for get_about_section"
This reverts commit 05e1bcf4f1.
|
2012-07-06 17:23:56 -04:00 |
|
Matthew Mongeau
|
05e1bcf4f1
|
workarounds for get_about_section
|
2012-07-06 17:13:53 -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 |
|