Commit Graph

12 Commits

Author SHA1 Message Date
Rocky Duan
1742775262 added configuration parameter to turn on / off discussion service 2012-08-13 15:35:19 -07:00
Rocky Duan
0ae68e7324 Merge branch 'master' of github.com:MITx/mitx into merge
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
2012-08-06 22:38:31 -04:00
ichuang
0347eb498c add MITX_FEATURES flags to enable textbook and discussion,
and modify course_navigation correspondingly
2012-08-05 20:24:00 -04:00
Rocky Duan
54ea3dba22 show news & options when submit comment 2012-07-25 15:30:05 -04:00
Rocky Duan
bedeac3a55 make course id available in xmodule 2012-07-24 18:51:56 -04:00
Rocky Duan
616eaf2500 integrated search; refactored some frontend code 2012-07-23 15:41:09 -04:00
Rocky Duan
784bd26510 forum view for discussions 2012-07-22 19:05:32 -04:00
Bridger Maxwell
b69deb698d Got the view page of the wiki rendering. Most of it is a styling mess. 2012-06-29 12:05:55 -04:00
Matthew Mongeau
56d5e54150 Hook up about and jobs pages. Use named route for root. 2012-06-27 13:52:49 -04:00
Matthew Mongeau
a681eed8a4 Fix additional urls. 2012-06-26 17:46:37 -04:00
Matthew Mongeau
b8d50e51ee Course navigation work 2012-06-26 17:23:16 -04:00
Matthew Mongeau
8d66f5ee07 Menu work. 2012-06-14 14:52:10 -04:00