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

..

course_navigation.html

Merge branch 'master' into feature/bk_forum_int

2012-08-20 18:57:46 -04:00

courseware-error.html

Fixed up courseware-error view. Moved it to templates/courseware too.

2012-08-20 15:03:55 -04:00

courseware.html

Merge branch 'master' into feature/bk_forum_int

2012-08-20 18:57:46 -04:00

grade_summary.html

Moved the course template pages to be templates/courseware/

2012-08-20 14:54:23 -04:00

gradebook.html

Moved the course template pages to be templates/courseware/

2012-08-20 14:54:23 -04:00

info.html

Moved the course template pages to be templates/courseware/

2012-08-20 14:54:23 -04:00

instructor_dashboard.html

Moved the course template pages to be templates/courseware/

2012-08-20 14:54:23 -04:00

progress_graph.js

Moved the course template pages to be templates/courseware/

2012-08-20 14:54:23 -04:00

progress.html

Moved the course template pages to be templates/courseware/

2012-08-20 14:54:23 -04:00