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

..

circuit

Splitting files into subdirectories in preparation for merge

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

courseware

Merge branch 'master' into dogfood

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

heartbeat

Dirt-simple heartbeat page for use by AWS load balancers

2012-05-22 15:39:40 -04:00

multicourse

debugging statement in multicourse.views

2012-05-28 10:05:57 -04:00

simplewiki

Check for None with is rather than ==

2012-06-01 12:18:43 -04:00

ssl_auth

in sslauth, auto-create user when settings.DEBUG=true

2012-05-29 07:33:50 -04:00

static_template_view

Splitting files into subdirectories in preparation for merge

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

staticbook

Allow anonymous user access to the site. Requires guest_courses.xml and info/guest_updates.html to be set created in the data repository

2012-04-30 15:18:47 -04:00

student

Merge branch 'master' into anonymous_user

2012-05-08 13:54:57 -04:00

track

Splitting files into subdirectories in preparation for merge

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