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

..

capa

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

management

Splitting files into subdirectories in preparation for merge

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

migrations

Splitting files into subdirectories in preparation for merge

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

modules

Merge branch 'master' into anonymous_user

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

__init__.py

Moved potential failure outside of unrelated try/catch block that would have masked the missing settings.DATA_DIR

2012-04-17 18:28:59 -04:00

content_parser.py

Make showanswer and rerandomize propogate downwards in course.xml

2012-05-07 15:36:13 -04:00

global_course_settings.py

Put graders into their own file. Incorporated other feedback from pull request.

2012-04-17 18:07:56 -04:00

graders.py

Changed CourseGrader to be an abstract base class.

2012-04-17 18:17:43 -04:00

grades.py

Put graders into their own file. Incorporated other feedback from pull request.

2012-04-17 18:07:56 -04:00

models.py

Splitting files into subdirectories in preparation for merge

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

module_render.py

Merge branch 'master' into anonymous_user

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

progress.py

Splitting files into subdirectories in preparation for merge

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

tests.py

Merge pull request #18 from MITx/grade-refactor

2012-05-09 15:00:25 -07:00

urls.py

Splitting files into subdirectories in preparation for merge

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

views.py

Merge branch 'master' into anonymous_user

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