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

Bok-Choy Video Tests Batch9

2014-06-02 11:48:40 +00:00

envs

Merge branch 'release'

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

lib

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -04:00

static

Fixed links for units loaded via ajax.

2014-06-02 14:19:19 +05:00

templates

Diacritic Plugin for Annotator Tool: Pull-request Fixes

2014-06-02 10:45:29 -04:00

__init__.py

…

.coveragerc

…

startup.py

Fix bad interaction between pluggable InputTypes and Microsites

2014-04-01 16:49:15 -04:00

tests.py

Test TemplateLookup dirs are not cleared during lms startup.

2014-04-03 20:23:44 +05:00

urls.py

Remove gradebook code from legacy.py (moved to instructor/views/api.py)

2014-05-27 10:59:16 -04:00

wsgi_apache_lms.py

apache lms wsgi fix

2013-09-16 21:46:57 -07:00

wsgi.py

Remove extraneous configuration

2014-02-04 15:35:26 -05:00