David Ormsbee d0bff1ed3c Merge branch 'master' into jmpm-analytics ...

Conflicts:
	lms/djangoapps/instructor/views.py
	lms/envs/common.py
	lms/templates/courseware/instructor_dashboard.html

2013-03-06 17:09:09 -05:00

..

applets/capa

Replace editamolecule input type applet with GWT version

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

coffee

new cohorts tested

2013-03-01 16:33:27 -05:00

css

use same images for prev/next as used in image-based textbooks

2013-02-26 16:43:48 -05:00

images

Add in a better notification icon

2013-02-09 10:15:11 -05:00

js

Merge branch 'master' into jmpm-analytics

2013-03-06 17:09:09 -05:00

sass

studio - correcting an image-replacement Sass mixin

2013-02-13 09:18:23 -05:00

scripts

fix tests on merge

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