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

..

applets/capa

Replace editamolecule input type applet with GWT version

2013-02-05 20:15:50 -05:00

coffee

Add support for search spell corrections to Forums UX.

2014-06-05 15:00:29 -04:00

css

Diacritic Plugin for Annotator TooL: Added CSS and JS files

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

data/geoip

Embargo Middleware feature

2014-02-27 08:37:58 -05:00

fonts

adds/relocates shared vendor css (and assets) to static directories

2013-10-16 16:45:32 -04:00

images

Upgrade to TinyMCE 4.0.16.

2014-04-02 10:35:27 -04:00

js

Merge branch 'release'

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

sass

Allow editing of container xblocks/xmodules

2014-05-29 14:02:45 -04:00

scripts

fix tests on merge

2013-01-04 10:32:31 -05:00

.gitignore

Ignore compiled xmodule assets

2013-04-18 15:46:08 -04:00

js_test.yml

Add repsonse pagination to inline discussions

2014-04-02 14:32:58 -04:00