Calen Pennington f30596c499 Merge branch 'master' into specific-error-handling ...

Conflicts:
	djangoapps/courseware/views.py

2012-05-17 11:39:21 -04:00

..

capa

Ike's changes to enable multicourse, new response types, etc.

2012-05-16 21:18:47 -04:00

management

Fixing up check_course to pull in modules correctly

2012-05-17 09:18:36 -04:00

migrations

Splitting files into subdirectories in preparation for merge

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

modules

Ike's changes to enable multicourse, new response types, etc.

2012-05-16 21:18:47 -04:00

test_files

Ike's changes to enable multicourse, new response types, etc.

2012-05-16 21:18:47 -04:00

__init__.py

Moved grading code from init to grades.py to fix existing scripts

2012-05-12 17:16:36 -04:00

content_parser.py

Ike's changes to enable multicourse, new response types, etc.

2012-05-16 21:18:47 -04:00

global_course_settings.py

merge with master

2012-05-10 12:25:33 -04:00

graders.py

merge with master

2012-05-10 12:25:33 -04:00

grades.py

Ike's changes to enable multicourse, new response types, etc.

2012-05-16 21:18:47 -04:00

models.py

Splitting files into subdirectories in preparation for merge

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

module_render.py

Ike's changes to enable multicourse, new response types, etc.

2012-05-16 21:18:47 -04:00

progress.py

Splitting files into subdirectories in preparation for merge

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

tests.py

Ike's changes to enable multicourse, new response types, etc.

2012-05-16 21:18:47 -04: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 specific-error-handling

2012-05-17 11:39:21 -04:00