Don Mitchell 2db0401273 Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag ...

Conflicts:
	cms/envs/common.py

2013-01-23 14:13:17 -05:00

..

djangoapps

Merge pull request #1295 from MITx/feature/jarv/certificate-force-update

2013-01-23 06:32:41 -08:00

envs

Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag

2013-01-23 14:13:17 -05:00

lib

Commented on high level functions

2013-01-22 01:40:13 -07:00

static

studio - resolved base variable missing issue on lms side

2013-01-22 16:31:42 -05:00

templates

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2013-01-22 14:47:52 -05:00

__init__.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

.coveragerc

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

CHANGELOG.md

Add comment about the target of change log entries

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

urls.py

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2013-01-22 14:47:52 -05:00

wsgi.py

Add a wsgi file for the lms that loads the modulestores immediately after the application starts

2012-08-28 12:01:05 -04:00