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

Conflicts:
	common/lib/xmodule/xmodule/modulestore/draft.py

2013-04-08 15:02:47 -04:00

..

djangoapps

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

2013-04-08 15:02:47 -04:00

envs

Merge remote-tracking branch 'origin/master' into feature/markchang/studio-analytics

2013-04-04 16:11:22 -04:00

static

studio - resolving margin-top issue with views that don't have a masthead

2013-04-05 16:30:51 -04:00

templates

Merge pull request #1827 from MITx/fix/btalbot/studio-socktypo

2013-04-08 11:23:16 -07: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