Arthur Barrett 1da644fcb3 merge from master. resolved conflict with test_responsetypes.py by using the version from master.

2013-02-28 11:22:32 -05:00

..

applets/capa

Replace editamolecule input type applet with GWT version

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

coffee

Merge branch 'master' into feature/abarrett/annotatable_xmodule

2013-02-27 11:58:38 -05:00

css

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

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

images

added partially correct icon from marco

2013-02-27 14:36:14 -05:00

js

merge from master. resolved conflict with test_responsetypes.py by using the version from master.

2013-02-28 11:22:32 -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