edx-platform

Files

Chris Dodge 3b5e17ef55 Merge branch 'master' into feature/cdodge/cms-master-merge2

Conflicts:
	.gitmodules
	common/djangoapps/__init__.py
	common/djangoapps/track/migrations/__init__.py
	common/lib/capa/capa/inputtypes.py
	common/lib/capa/capa/responsetypes.py
	common/lib/capa/capa/templates/openendedinput.html
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/video_module.py
	common/static/sass/bourbon/css3/_box-sizing.scss
	doc/development.md
	lms/djangoapps/instructor/tests.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/video.html
	requirements.txt
	test-requirements.txt

2013-01-07 12:34:48 -05:00

cms

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

2013-01-07 12:34:48 -05:00

devgroups

Revert "remove (almost) all references to askbot."

2012-11-09 18:18:37 -05:00

__init__.py

Moving LMS code into subdirectory

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

acceptance.py

Improve some comments and names in the acceptance test framework

2013-01-02 10:44:21 -05:00

aws.py

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

common.py

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

2013-01-07 12:34:48 -05:00

content.py

Use relative includes in settings files

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

dev_edx4edx.py

Move logsettings to common, so that it's shared between cms and lms

2012-10-11 12:31:52 -04:00

dev_ike.py

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-11-16 09:03:15 -05:00

dev_int.py

Fix typo that caused two classes to not get loaded

2012-08-15 14:32:36 -04: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

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

devplus.py

Revert "remove (almost) all references to askbot."

2012-11-09 18:18:37 -05:00

discussionsettings.py

image uploading & render markdown

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

edx4edx_aws.py

Revert "remove (almost) all references to askbot."

2012-11-09 18:18:37 -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

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-11-16 09:03:15 -05:00

test_ike.py

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-11-16 09:03:15 -05:00

test.py

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -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