Calen Pennington 5011f60d45 Merge branch 'master' into anonymous_user ...

Conflicts:
	djangoapps/courseware/module_render.py
	djangoapps/courseware/modules/capa_module.py

2012-05-10 09:17:26 -04:00

..

__init__.py

Splitting files into subdirectories in preparation for merge

2012-03-19 11:10:44 -04:00

capa_module.py

Merge branch 'master' into anonymous_user

2012-05-10 09:17:26 -04:00

html_module.py

Refactor for reusability: x_modules take common parameters as an object. capa_problem to take a file object and not filename.

2012-05-07 20:59:08 -04:00

schematic_module.py

Moved extra settings into state. Added fs module for aux content

2012-05-07 20:13:30 -04:00

seq_module.py

Refactor for reusability: x_modules take common parameters as an object. capa_problem to take a file object and not filename.

2012-05-07 20:59:08 -04:00

template_module.py

Refactor for reusability: x_modules take common parameters as an object. capa_problem to take a file object and not filename.

2012-05-07 20:59:08 -04:00

vertical_module.py

Refactor for reusability: x_modules take common parameters as an object. capa_problem to take a file object and not filename.

2012-05-07 20:59:08 -04:00

video_module.py

Refactor for reusability: x_modules take common parameters as an object. capa_problem to take a file object and not filename.

2012-05-07 20:59:08 -04:00

x_module.py

Refactor for reusability: x_modules take common parameters as an object. capa_problem to take a file object and not filename.

2012-05-07 20:59:08 -04:00