Steve Strassmann 8baddc0645 Merge branch 'master' of https://github.com/MITx/mitx into feature/i18n

2013-04-24 10:41:09 -04:00

..

djangoapps

Merge pull request #1858 from MITx/feature/ichuang/masquerade-v3

2013-04-24 04:17:34 -07:00

envs

Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/masquerade-v3

2013-04-20 12:25:47 -04:00

lib

use new API verbs

2013-04-23 13:28:23 -04:00

static

fix merge conflict

2013-04-23 10:30:51 -04:00

templates

Merge branch 'master' of https://github.com/MITx/mitx into feature/i18n

2013-04-24 10:41:09 -04:00

__init__.py

…

.coveragerc

Change coverage report config to reflect refactoring of terrain files

2013-02-20 09:31:50 -05:00

CHANGELOG.md

Add comment about the target of change log entries

2012-10-30 16:48:47 -04:00

one_time_startup.py

ummm. forgot to commit stuff

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

urls.py

Merge pull request #1858 from MITx/feature/ichuang/masquerade-v3

2013-04-24 04:17:34 -07:00

wsgi.py

…

xmodule_namespace.py

make "edit" links work - fixes giturl (was broken by xblocks migration)

2013-04-07 00:03:36 +00:00