Diana Huang 47ce9082e4 Merge branch 'release' ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/courseware/tests/modulestore_config.py

2013-09-13 17:15:44 -04:00

..

djangoapps

Merge branch 'release'

2013-09-13 17:15:44 -04:00

envs

Merge pull request #925 from mulby/fix/gabe/configurable-tracking-filter

2013-09-13 11:10:59 -07:00

lib

home button working, default to home when no thread selected

2013-07-29 23:33:50 -04:00

static

Merge branch 'release'

2013-09-13 17:15:44 -04:00

templates

Merge branch 'release'

2013-09-13 17:15:44 -04:00

xblock

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

__init__.py

…

.coveragerc

Change coverage report config to reflect refactoring of terrain files

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

startup.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

urls.py

Merge branch 'master' into ormsbee/verifyuser3

2013-09-09 10:18:25 -04:00

wsgi_apache_lms.py

The bulk of Shibboleth authentication for Stanford

2013-06-19 00:48:18 -07:00

wsgi.py

Centralize startup code, and execute in all contexts

2013-08-27 12:12:20 -04:00