edx-platform

Files

Victor Shnayder 84f05f9f61 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/foldit_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_conditional.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py

2013-03-08 00:40:18 -05:00

public

Merge pull request #1597 from MITx/docs/valera/drag_and_drop

2013-03-06 14:55:02 -08:00

code_standards.txt

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

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

development.md

Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model

2013-02-07 15:12:30 -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

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'