Brian Talbot 78079d1ca7 Merge branch 'master' into drupal-new

2013-04-08 22:35:29 -04:00

..

djangoapps

Merge pull request #1821 from MITx/fix/cdodge/student-to-user-name-change

2013-04-08 08:20:19 -07:00

envs

Merge branch 'master' into drupal-new

2013-04-08 22:35:29 -04:00

lib

Merge pull request #1589 from MITx/peter/symbolic

2013-03-27 10:40:50 -07:00

static

Merge branch 'master' into drupal-new

2013-04-08 22:35:29 -04:00

templates

Merge branch 'master' into drupal-new

2013-04-08 22:35:29 -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 branch 'master' into drupal-new

2013-04-08 22:35:29 -04: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