Chris Dodge 3727edabf2 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules ...

Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/modulestore/draft.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	common/lib/xmodule/xmodule/xml_module.py

2013-04-02 09:09:45 -04:00

..

djangoapps

Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules

2013-04-02 09:09:45 -04:00

envs

Enable dev env support for sass source maps

2013-03-29 18:34:02 -04:00

static

studio - corrected JQ selector for smoothscrolling in-page links

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

templates

remove unused parameter

2013-03-29 15:26:21 -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

wip

2013-03-26 16:40:28 -04:00