cahrens b2bda10435 Merge branch 'master' into bug/christina/studio ...

Conflicts:
	cms/djangoapps/contentstore/features/common.py
	cms/djangoapps/contentstore/features/section.py
	cms/djangoapps/contentstore/features/subsection.feature

2013-03-28 11:17:47 -04:00

..

djangoapps

Merge branch 'master' into bug/christina/studio

2013-03-28 11:17:47 -04:00

envs

ummm. forgot to commit stuff

2013-03-27 22:51:52 -04:00

static

studio - corrected JQ selector for smoothscrolling in-page links

2013-03-27 01:34:25 -04:00

templates

Bug fix for grading type not showing on course outline (#258).

2013-03-28 10:54:10 -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

ummm. forgot to commit stuff

2013-03-27 22:51:52 -04:00

urls.py

Merge branch 'bug/dhm/date-parse' of github.com:MITx/mitx into bug/dhm/date-parse

2013-03-22 16:56:31 -04:00

xmodule_namespace.py

Small pylint cleanup

2013-03-18 12:45:46 -04:00