edx-platform

Files

Calen Pennington 1bfb933518 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	cms/templates/edit_subsection.html
	cms/templates/overview.html
	cms/templates/unit.html
	cms/templates/widgets/header.html
	common/djangoapps/course_groups/tests/tests.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/js/src/.gitignore
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml_exporter.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/open_ended_grading/tests.py

2013-03-04 16:33:40 -05:00

cms

Merge branch 'master' into feature/cdodge/cms-master-merge2

2013-01-07 12:34:48 -05: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

Remove portal (fake) app, move tests to courseware.

2013-02-19 16:46:32 -05:00

aws.py

re-enable discussion service

2013-02-22 10:40:09 +02:00

common.py

Merge pull request #1516 from MITx/hack/dave/submission_history

2013-03-04 11:39:54 -08: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

Fix dev settings

2013-02-11 17:33:16 -05: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 jasmine testing quieter

2012-11-13 10:55:17 -05: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

Fix tests

2013-02-20 12:44:12 -05: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