Chris Dodge 8fdeee06ed Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements ...

Conflicts:
	cms/one_time_startup.py
	common/lib/xmodule/xmodule/modulestore/mongo.py

2013-03-28 13:27:29 -04:00

..

djangoapps

Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements

2013-03-28 13:27:29 -04:00

envs

ummm. forgot to commit stuff

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

lib

Merge pull request #1589 from MITx/peter/symbolic

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

static

styled textbook css to look closer to the discussion forum navigation

2013-03-22 11:04:44 -04:00

templates

Remove duplicate login dialog.

2013-03-25 15:16:00 -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

XBlock SDK announcement

2013-03-16 14:26:14 -07: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

xmodule_namespace.py

Small pylint cleanup

2013-03-18 12:45:46 -04:00