cahrens 17c710af83 Merge branch 'master' into feature/christina/metadata-ui ...

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml

2013-05-27 20:08:09 -04:00

..

djangoapps

Merge branch 'master' into feature/christina/metadata-ui

2013-05-24 16:10:34 -04:00

envs

Merge branch 'master' into feature/christina/metadata-ui

2013-05-24 16:10:34 -04:00

static

Merge branch 'style/btalbot/metadata-ui' into feature/christina/metadata-ui

2013-05-24 09:49:57 -04:00

templates

Merge branch 'master' into feature/christina/metadata-ui

2013-05-27 20:08:09 -04:00

__init__.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

.coveragerc

Change coverage report config to reflect refactoring of terrain files

2013-02-20 09:53:12 -05:00

CHANGELOG.md

Add changelog information

2012-11-06 10:34:51 -05:00

manage.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

one_time_startup.py

remove discussion cache, which isn't used

2013-04-05 15:27:50 -04:00

urls.py

Remove proof-of-concept page

2013-05-22 15:55:51 -04:00

xmodule_namespace.py

Get rid of empty, store ID.

2013-05-21 14:29:33 -04:00