Commit Graph

5 Commits

Author SHA1 Message Date
Arjun Singh
99703761b0 Merge master 2012-08-21 12:01:09 -07:00
David Ormsbee
3f0fba71d9 Remove non-functioning News tab. Enable Instructor tab from Discussion page 2012-08-21 14:29:30 -04:00
Arjun Singh
1cfed46d06 Adding a syllabus page (accessible via course navigation) 2012-08-21 05:47:26 -07: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
Bridger Maxwell
0ac5ded095 Moved the course template pages to be templates/courseware/ 2012-08-20 14:54:23 -04:00