edx-platform

Files

Greg Price a0fb4d6c85 Merge branch 'master' into drupal-new

Conflicts:
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/base/_base.scss
	lms/templates/forgot_password_modal.html

2013-05-10 10:30:10 -04:00

cms

Enable meta-universities (organizations that contain other)

2013-03-28 13:23:50 -04:00

devgroups

Pep8 autofixes

2013-02-06 11:13:50 -05:00

__init__.py

Moving LMS code into subdirectory

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

acceptance.py

Refactor choosing the browser for lettuce tests to settings.py

2013-04-18 10:18:35 -04:00

aws.py

Merge branch 'master' into drupal-new

2013-05-10 10:30:10 -04:00

common.py

Merge branch 'master' into drupal-new

2013-05-10 10:30:10 -04:00

content.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

dev_edx4edx.py

Remove dogfood and quickedit.

2013-02-13 12:23:08 -05:00

dev_ike.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

dev_int.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

dev_mongo.py

Move mitxmako out of common lib, and pass template rendering function into MongoModuleStore

2012-08-16 12:49:42 -04:00

dev.py

Move the testcenter login to external_auth

2013-04-25 11:12:19 -04:00

devplus.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

discussionsettings.py

image uploading & render markdown

2012-07-27 17:50:38 -04:00

edx4edx_aws.py

Remove dogfood and quickedit.

2013-02-13 12:23:08 -05:00

jasmine.py

Make ordering of js bundles during jasmine tests consistant

2013-04-30 14:09:17 -04:00

README.txt

update lms readme

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

static.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

test_ike.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

test.py

Merge pull request #1866 from MITx/feature/cale/enable-rednose

2013-04-17 10:15:25 -07: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