Calen Pennington 34a696cdf6 Merge branch 'master' into cpennington/cms ...

Conflicts:
	rakefile
	requirements.txt

2012-06-18 13:46:33 -04:00

..

test_files

remove loncapa import in formularesponse_with_hint test (jenkins

2012-06-10 22:39:16 -04:00

__init__.py

Move CAPA problem specific xml parsing utilities out of content_parser into xmodule

2012-06-06 14:15:33 -04:00

capa_module.py

added TODO comment

2012-06-13 10:18:53 -04:00

graders.py

Document the aggregate_scores function

2012-06-07 10:46:10 -04:00

html_module.py

Move tests for xmodules into the xmodule library, and make them run without django

2012-06-07 10:46:10 -04:00

schematic_module.py

Moving capa and xmodule out of djangoapps/courseware, and removing django references from them

2012-06-06 14:15:32 -04:00

seq_module.py

Add categories and XModuleDescriptors for all module types that are used at the top level of a course

2012-06-18 11:22:36 -04:00

setup.py

Add categories and XModuleDescriptors for all module types that are used at the top level of a course

2012-06-18 11:22:36 -04:00

template_module.py

Documenting customtag format, and making it less brittle

2012-06-07 11:04:39 -04:00

tests.py

added stringresponse_with_hint test

2012-06-10 22:06:13 -04:00

vertical_module.py

Move tests for xmodules into the xmodule library, and make them run without django

2012-06-07 10:46:10 -04:00

video_module.py

Add categories and XModuleDescriptors for all module types that are used at the top level of a course

2012-06-18 11:22:36 -04:00

x_module.py

Add categories and XModuleDescriptors for all module types that are used at the top level of a course

2012-06-18 11:22:36 -04:00