Diana Huang 90951a7bdb Merge branch 'release' ...

Conflicts:
	CHANGELOG.rst
	common/lib/xmodule/xmodule/js/fixtures/lti.html
	common/lib/xmodule/xmodule/js/spec/lti/constructor.js
	common/lib/xmodule/xmodule/js/src/lti/lti.js
	common/lib/xmodule/xmodule/lti_module.py
	lms/djangoapps/courseware/features/certificates.py
	lms/djangoapps/courseware/mock_lti_server/mock_lti_server.py
	lms/djangoapps/courseware/tests/test_lti.py
	lms/djangoapps/shoppingcart/models.py
	lms/envs/aws.py

2013-09-12 16:03:39 -04:00

..

djangoapps

Merge branch 'release'

2013-09-12 16:03:39 -04:00

envs

Merge branch 'release'

2013-09-12 16:03:39 -04: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-12 16:03:39 -04:00

templates

Merge branch 'release'

2013-09-12 16:03:39 -04:00

xblock

Use XBlock 0.3

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

__init__.py

…

.coveragerc

…

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