Sarina Canelake 2aea261d48 Merge branch 'release' ...

Conflicts:
	common/djangoapps/course_modes/views.py
	common/djangoapps/student/tests/test_roles.py
	common/djangoapps/student/views.py
	common/lib/opaque_keys/opaque_keys/__init__.py
	common/lib/opaque_keys/opaque_keys/tests/test_opaque_keys.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/notes/views.py

2014-06-10 16:59:23 -04:00

..

capa

Fixes BLD-1104

2014-06-03 10:30:58 -04:00

course_groups

Change behavior of cohort addition interface

2014-04-07 11:40:51 -04:00

fixtures

Add skip links to both CMS and LMS

2013-10-24 17:10:33 -04:00

spec

change .ui-disabled to .is-disabled

2014-04-17 11:15:02 -04:00

src

change .ui-disabled to .is-disabled

2014-04-17 11:15:02 -04:00

test

Internationalize forums CoffeeScript code

2014-01-14 13:04:51 -05:00

vendor

Reverting commit @3bfb633 and updating openseadragon.js for latest build

2014-06-06 15:40:03 -04:00

RequireJS-namespace-undefine.js

Convert Studio JS to use require.js

2013-10-04 13:43:50 -04:00

RequireJS-namespace.js

Convert Studio JS to use require.js

2013-10-04 13:43:50 -04:00