Commit Graph

9 Commits

Author SHA1 Message Date
Calen Pennington
448ca26cdf Remove simplewiki from the codebase 2013-06-20 09:06:29 -04:00
Ned Batchelder
7c8a90229e Use 'is None' and 'is not None' 2013-03-04 10:57:25 -05:00
Calen Pennington
1d1a9173a4 Cleaning up pep8 violations 2012-07-23 14:44:40 -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
ichuang
23128ced67 courseware views now goes to default chapter and section if unprovided
- uses multicourse settings (default_chapter and default_section)
  - it would be nice to use course_settings instead, but that is not
    currently compatible with multicourse
2012-07-01 12:51:14 -04:00
Calen Pennington
de07b8b345 Begin using a Keystore for XML parsing. Still broken: sequence icons, custom tags, problems, video js 2012-06-29 12:40:50 -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
Victor Shnayder
d61523ca39 Fix is_valid_course() in multicourse_settings
* Wasn't passing coursename through to get_course_settings
2012-06-06 16:54:43 -04:00
Calen Pennington
5ba03130aa Moving LMS code into subdirectory 2012-06-06 14:09:01 -04:00