edx-platform

Files

Chris Dodge fbbae44988 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master

Conflicts:
	cms/djangoapps/contentstore/views/course.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/django_comment_client/management/commands/show_permissions.py
	lms/djangoapps/django_comment_client/models.py
	lms/djangoapps/django_comment_client/tests/test_utils.py
	lms/envs/common.py

2013-05-20 10:22:36 -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

Disabled logging of warnings/errors for acceptance tests

2013-05-15 11:31:52 -04:00

aws.py

Merge pull request #2078 from edx/hotfix/rocha/celery-default-queue-name

2013-05-17 15:02:31 -07:00

common.py

Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master

2013-05-20 10:22:36 -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_with_worker.py

Added base Celery settings

2013-05-17 11:33:14 -04:00

dev.py

Add status app with simple view to check celery workers

2013-05-17 11:33:14 -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

Forgot to update phantom-jasmine location for LMS

2013-05-13 17:31:57 -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 #2063 from edx/feature/rocha/lets-use-celery

2013-05-17 12:36:23 -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