edx-platform

Files

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

__init__.py

Moving settings2/ folder to envs/

2012-04-02 14:15:44 -04:00

askbotsettings.py

enable mathjax in askbot

2012-04-19 10:26:26 -04:00

aws.py

Cleaning up the envs/* files so that they will work with gunicorn_django

2012-05-17 11:18:32 -04:00

common.py

Move CoffeeScripts to asset pipeline

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

content.py

Cleaning up the envs/* files so that they will work with gunicorn_django

2012-05-17 11:18:32 -04:00

dev_ike.py

dev_ike: MITX_ROOT_URL set based on hostname

2012-05-28 11:01:53 -04:00

dev.py

Use a key function that is safe for use w/ memcache

2012-05-25 09:30:04 -04:00

devplus.py

Use a key function that is safe for use w/ memcache

2012-05-25 09:30:04 -04:00

logsettings.py

Merge branch 'master' into asset-pipeline

2012-05-21 14:53:16 -04:00

README.txt

show instructions for gunicorn

2012-04-02 14:58:04 -04:00

static.py

Use a key function that is safe for use w/ memcache

2012-05-25 09:30:04 -04:00

test_ike.py

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

2012-06-02 18:58:58 -04:00

test.py

Use a key function that is safe for use w/ memcache

2012-05-25 09:30:04 -04:00

README.txt

Transitional for moving to new settings scheme. 

To use: 
  django-admin.py runserver --settings=envs.dev --pythonpath=.

NOTE: Using manage.py will automatically run mitx/settings.py first, regardless
of what you send it for an explicit --settings flag. It still works, but might
have odd side effects. Using django-admin.py avoids that problem. 
django-admin.py is installed by default when you install Django.

To use with gunicorn_django in debug mode:

  gunicorn_django envs/dev.py