David Ormsbee 78acd083be Merge branch 'master' into ormsbee/verifyuser3 ...

Conflicts:
	common/djangoapps/course_modes/models.py
	lms/djangoapps/shoppingcart/models.py
	lms/djangoapps/shoppingcart/processors/CyberSource.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/shoppingcart/tests/test_views.py
	lms/djangoapps/shoppingcart/urls.py
	lms/djangoapps/shoppingcart/views.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/static/sass/base/_variables.scss

2013-09-04 10:58:30 -04:00

..

djangoapps

Merge branch 'master' into ormsbee/verifyuser3

2013-09-04 10:58:30 -04:00

envs

Merge branch 'master' into ormsbee/verifyuser3

2013-09-04 10:58:30 -04:00

lib

home button working, default to home when no thread selected

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

static

Merge branch 'master' into ormsbee/verifyuser3

2013-09-04 10:58:30 -04:00

templates

Merge branch 'master' into ormsbee/verifyuser3

2013-09-04 10:58:30 -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

Centralize startup code, and execute in all contexts

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

urls.py

Merge branch 'master' into ormsbee/verifyuser3

2013-09-04 10:58:30 -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

xmodule_namespace.py

add static_asset_path metadata to course, and honor its use in link rewriting

2013-08-12 20:26:20 +00:00