edx-platform

Files

Calen Pennington 801df37872 Merge remote-tracking branch 'origin/master' into arjun/javascript_response

Conflicts:
	common/lib/xmodule/xmodule/js/src/capa/display.coffee
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/module_render.py

2012-08-13 10:13:21 -04:00

devgroups

add config files for running different server groups in dev

2012-08-10 02:02:44 -04:00

__init__.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

askbotsettings.py

Wip on sign up form.

2012-06-28 15:38:39 -04:00

aws.py

Clean up minor whitespace stuff in settings

2012-07-30 12:59:28 -04:00

common.py

Merge remote-tracking branch 'origin/master' into arjun/javascript_response

2012-08-13 10:13:21 -04:00

content.py

Use relative includes in settings files

2012-06-06 14:16:28 -04:00

dev_edx4edx.py

fix dev_edx4edx mako path - add EDX4EDX_ROOT

2012-07-01 17:44:04 +00:00

dev_ike.py

reroute email on AWS test machine (dev_ike)

2012-08-12 18:39:39 -04:00

dev_mongo.py

add options to dev_mongo env

2012-07-24 16:14:01 -04:00

dev.py

change xqa server location to suburl

2012-08-12 18:29:48 -04:00

devplus.py

Adding a setting to disable the wiki in deployment.

2012-07-13 13:36:38 -04:00

edx4edx_aws.py

lms/envs/edx4edx_aws update

2012-07-01 12:53:31 -04:00

logsettings.py

Make logging work for xmodule and company.

2012-07-26 14:49:11 -04:00

README.txt

update lms readme

2012-07-27 16:06:54 -04:00

static.py

Use relative includes in settings files

2012-06-06 14:16:28 -04:00

test_ike.py

Use relative includes in settings files

2012-06-06 14:16:28 -04:00

test.py

Merge branch 'master' into feature/server_split

2012-08-13 00:36:31 -04:00

with_cms.py

Separate cms and lms auth and env files, and have the LMS that runs with the CMS use the CMS modulestore

2012-07-30 12:59:28 -04:00

README.txt

Transitional for moving to new settings scheme.

To use:
   rake lms
   or
   django-admin.py runserver --settings=lms.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 lms/envs/dev.py