Diana Huang b3767fc553 Merge branch 'master' into feature/diana/close-oe-problems ...

Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/peer_grading_module.py

2013-02-20 11:20:10 -05:00

..

djangoapps

Merge pull request #1489 from MITx/feature/vik/settings-to-xmodule

2013-02-20 08:06:20 -08:00

envs

Merge pull request #1489 from MITx/feature/vik/settings-to-xmodule

2013-02-20 08:06:20 -08:00

lib

Remove dogfood and quickedit.

2013-02-13 12:23:08 -05:00

static

Merge pull request #1484 from MITx/feature/vik/improve-oe-ui

2013-02-19 07:27:29 -08:00

templates

Merge branch 'master' into feature/diana/close-oe-problems

2013-02-20 11:20:10 -05:00

__init__.py

…

.coveragerc

Change coverage report config to reflect refactoring of terrain files

2013-02-20 09:31:50 -05:00

CHANGELOG.md

Add comment about the target of change log entries

2012-10-30 16:48:47 -04:00

urls.py

merge

2013-02-14 12:49:14 -05:00

wsgi.py

Add a wsgi file for the lms that loads the modulestores immediately after the application starts

2012-08-28 12:01:05 -04:00