Greg Price 0d37b4b254 Merge branch 'release' ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
	common/djangoapps/student/management/commands/create_random_users.py
	common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
	lms/djangoapps/bulk_email/forms.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/management/commands/openended_post.py
	lms/djangoapps/instructor/management/commands/openended_stats.py
	lms/djangoapps/instructor/tests/test_spoc_gradebook.py

2014-06-02 15:29:40 -04:00

..

djangoapps

Merge branch 'release'

2014-06-02 15:29:40 -04:00

envs

removes qualaroo from studio (STUD-1684)

2014-05-30 10:05:35 -04:00

lib

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

static

Fix the title of edit modals from the unit page.

2014-05-29 17:10:33 -04:00

templates

Merge pull request #3937 from edx/adam/remove-qualaroo-studio

2014-05-30 14:25:40 -04:00

__init__.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

.coveragerc

Change coverage report config to reflect refactoring of terrain files

2013-02-20 09:53:12 -05:00

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

Fix ssl redirection test

2014-05-13 14:13:45 -04:00

wsgi.py

Centralize startup code, and execute in all contexts

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