ichuang
|
4f830eb316
|
fix static_replace use of re.subs flags to be python2.6 compatible
|
2012-07-10 22:32:46 -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 |
|
Calen Pennington
|
5406b9bb40
|
Make /static/ urls work in the courseware
|
2012-07-10 12:54:47 -04:00 |
|
Prem Sichanugrist
|
0f60459709
|
Add @expect_json to help with parsing JSON request
|
2012-07-05 09:38:51 -04:00 |
|
Calen Pennington
|
cac53cf1a0
|
Switch the cms over to using django-pipeline
|
2012-06-19 14:30:19 -04:00 |
|
Calen Pennington
|
f8434b3a6d
|
Move libraries that can only be imported in the context of django into common/djangoapps
|
2012-06-18 13:48:26 -04:00 |
|
Calen Pennington
|
5404345b1f
|
Make tests pass when running on cms
|
2012-06-18 13:21:06 -04:00 |
|
Calen Pennington
|
8134bcbc3d
|
Get the cms up to the point of rendering a template
|
2012-06-08 14:01:41 -04:00 |
|