Nimisha Asthagiri 8855b12b76 Update tests to allow LMS tests to use published branch setting. ...

Conflicts:
	cms/djangoapps/contentstore/views/tests/test_container_page.py
	common/djangoapps/external_auth/tests/test_shib.py
	common/djangoapps/student/tests/test_login.py
	common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/branding/tests.py
	lms/djangoapps/courseware/tests/test_submitting_problems.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/instructor_task/tests/test_base.py
	lms/djangoapps/instructor_task/tests/test_integration.py

2014-07-09 21:10:12 -04:00

..

djangoapps

Update tests to allow LMS tests to use published branch setting.

2014-07-09 21:10:12 -04:00

envs

Merge pull request #4353 from edx/flowerhack/lms-deprecated-urls

2014-07-09 18:23:00 -04:00

lib

Add Studio handling for changes to group configurations

2014-06-20 11:41:22 -04:00

static

BLD-1117: Add read-only list of Group Configurations.

2014-07-02 18:26:27 +03:00

templates

Merge pull request #4316 from edx/anton/group-experiments

2014-07-07 20:03:43 +03:00

__init__.py

…

.coveragerc

…

startup.py

Remove obselete cms startup code

2014-01-24 16:42:38 -05:00

urls_dev.py

Add the ability to view templates in a browser in development mode

2014-02-07 14:56:35 -05:00

urls.py

Enables LMS to handle deprecated URLs

2014-07-09 21:51:37 +00:00

wsgi.py

Centralize startup code, and execute in all contexts

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