Commit Graph

6 Commits

Author SHA1 Message Date
ichuang
7fe75030cc fix staff edit link in module content display (goes to github) 2012-08-04 17:52:14 -04:00
ichuang
9b90068e03 Merge branch 'stable-edx4edx' of github.com:MITx/mitx
Conflicts:
	common/lib/xmodule/seq_module.py
	common/lib/xmodule/xmodule/capa_module.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/multicourse/multicourse_settings.py
2012-07-08 16:52:36 -04:00
Calen Pennington
f25478b3d4 Consolidate access to metadata, and allow some of it to be inherited between modules 2012-06-29 12:45:46 -04:00
Calen Pennington
d7ee03874d Make staff histograms work again 2012-06-29 12:45:18 -04:00
ichuang
b59b80871a add edit link to module pages with filenames (html & problem)
uses new 'github_url' dict key in multicourse_settings
this replaces the previous "quickedit" functionality
2012-06-24 14:46:02 -04:00
Calen Pennington
5ba03130aa Moving LMS code into subdirectory 2012-06-06 14:09:01 -04:00