David Ormsbee
|
b0894c3973
|
Fix tests for other courses - create default discussion roles on demand if they don't exist
|
2012-08-21 12:38:39 -04:00 |
|
David Ormsbee
|
b31722bcff
|
Merge branch 'master' into feature/bk_forum_int
|
2012-08-21 12:05:06 -04:00 |
|
David Ormsbee
|
eb96497cff
|
Merge branch 'master' into feature/bk_forum_int
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/courseware/courseware.html
requirements.txt
|
2012-08-20 18:57:46 -04:00 |
|
Victor Shnayder
|
868b076ea7
|
html escape errors
|
2012-08-20 17:55:59 -04:00 |
|
Bridger Maxwell
|
0ac5ded095
|
Moved the course template pages to be templates/courseware/
|
2012-08-20 14:54:23 -04:00 |
|