Calen Pennington 8575ed439d Merge branch 'master' into dogfood ...

Conflicts:
	djangoapps/courseware/capa/responsetypes.py
	djangoapps/courseware/module_render.py
	djangoapps/courseware/modules/html_module.py
	djangoapps/courseware/modules/seq_module.py
	djangoapps/courseware/modules/x_module.py
	djangoapps/courseware/views.py
	templates/main.html
	templates/problem.js
	templates/textbox.html

2012-06-05 14:38:49 -04:00

..

capa

Merge branch 'master' into dogfood

2012-06-05 14:38:49 -04:00

management

Remove unused init_js and destroy_js

2012-05-31 13:24:24 -04:00

migrations

Splitting files into subdirectories in preparation for merge

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

modules

Merge branch 'master' into dogfood

2012-06-05 14:38:49 -04:00

test_files

symbolicresponse.xml test file

2012-06-02 18:59:54 -04:00

__init__.py

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

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

admin.py

admin for courseware student model

2012-05-27 23:33:29 -04:00

content_parser.py

Merge branch 'master' into dogfood

2012-06-05 14:38:49 -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

Check for None with is rather than ==

2012-06-01 12:18:43 -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 dogfood

2012-06-05 14:38:49 -04:00

progress.py

Splitting files into subdirectories in preparation for merge

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

tests.py

symbolicresponse test cases; tests pass. improved some error handling,

2012-06-02 18:58:58 -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 dogfood

2012-06-05 14:38:49 -04:00