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
|
3ae48d19b4
|
Passes course around for courseware. Fix static assets.
|
2012-07-03 12:13:15 -04:00 |
|
Matthew Mongeau
|
cddf4cf6cf
|
Wip on sign up form.
|
2012-06-28 15:38:39 -04:00 |
|
ichuang
|
bccdeb2a90
|
fix quickedit.html for latest css
|
2012-06-23 16:19:41 -04:00 |
|
Calen Pennington
|
279332e217
|
Fix other references to jquery after update to latest version
|
2012-06-21 10:59:47 -04:00 |
|
Calen Pennington
|
215085345c
|
Fix other references to jquery after update to latest version
|
2012-06-20 15:06:49 -04:00 |
|
Calen Pennington
|
5ba03130aa
|
Moving LMS code into subdirectory
|
2012-06-06 14:09:01 -04:00 |
|