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

..

templates

add hidden attribute to textline and textbox inputtypes, for javascript problems

2012-07-04 14:13:13 -04:00

__init__.py

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

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

calc.py

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

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

capa_problem.py

Merge branch 'stable-edx4edx' of github.com:MITx/mitx

2012-07-08 16:52:36 -04:00

checker.py

Remove references to djangosettings from responsetypes.py

2012-06-07 16:41:01 -04:00

correctmap.py

typo in correctmap

2012-06-12 13:52:34 -04:00

eia.py

add comment/explanation to eia.py

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

inputtypes.py

fixed two bugs in inputtypes: textline with quotes crashed problems, and

2012-07-06 09:49:08 -04:00

responsetypes.py

Exception, err -> Exception as err

2012-06-29 23:18:58 -04:00

util.py

util: tol.endswith

2012-06-12 13:43:14 -04:00