edx-platform

Files

Chris Dodge 22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4

Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt

2013-01-17 09:15:37 -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

added problem weight description

2013-01-14 19:20:49 -05:00

development.md

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

2013-01-11 14:04:46 -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

remote_gradebook.md

add documentation on remote gradebook xserver API

2013-01-10 23:59:20 -05:00

testing.md

update testing doc

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

xml-format.md

address Ike's comments

2013-01-15 11:44:27 -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'