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

code_standards.txt

Merge pull request #122 from MITx/cpennington/cms-review-cleanup

2012-06-20 05:34:36 -07:00

course_grading.md

Updates to grading doc.

2012-09-27 13:29:04 -04:00

development.md

perform a new merge from master, resolve conflicts

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

discussion.md

User profile page redone to act like the inline discussion, except threads are

2012-09-12 15:16:35 -07:00

mongo.md

just tickle a file to for build cms-master. I dont seem to have the rights to force a jenkins build.

2012-12-15 15:15:45 -05:00

overview.md

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

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

README

Update overview to reflect suggestions

2012-06-13 10:18:54 -04:00

testing.md

update testing doc

2013-01-03 11:22:21 -05:00

xml-format.md

perform a new merge from master, resolve conflicts

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

README

This directory contains some high level documentation for the code.  We should strive to keep it up-to-date, but don't take it as the absolute truth.

A good place to start is 'overview.md'