Calen Pennington 2113541632 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged ...

Conflicts:
	.ruby-version
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/models/settings/course_metadata.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py

2013-03-12 07:23:28 -04:00

..

djangoapps

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-12 07:23:28 -04:00

envs

Add datadog metrics capture around heartbeat timing

2013-03-08 10:36:59 -05:00

static

Need to trigger invalid instead of error, after changes for new version of Backbone.

2013-03-08 14:51:29 -05:00

templates

Be a little more liberal with what count's as not having a due date in a section

2013-03-11 15:29:58 -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

Add datadog metrics capture around heartbeat timing

2013-03-08 10:36:59 -05:00

urls.py

Add datadog metrics capture around heartbeat timing

2013-03-08 10:36:59 -05:00

xmodule_namespace.py

Clean up serialization on some fields

2013-03-08 21:17:19 -05:00