cahrens 8ace7fe57c Merge branch 'master' into bug/christina/studio ...

Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py

2013-04-01 12:30:07 -04:00

..

djangoapps

Merge branch 'master' into bug/christina/studio

2013-04-01 12:30:07 -04:00

envs

Enable meta-universities (organizations that contain other)

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

lib

Merge pull request #1589 from MITx/peter/symbolic

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

static

Add UTAustinX landing page

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

templates

Merge branch 'master' into bug/christina/studio

2013-04-01 12:30:07 -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

Add UTAustinX landing page

2013-03-28 13:23:58 -04: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

Convert due date to a Date (vs. a string with no year).

2013-04-01 11:37:05 -04:00