Brian Talbot 20553b00d3 resolving merge conflict with master

2013-02-15 09:32:38 -05:00

..

applets/capa

Replace editamolecule input type applet with GWT version

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

coffee

spread less than and greater than fix to responses and comments, and profile view

2013-02-12 09:18:46 -05:00

css/vendor

WIP Rename edit-a-molecule files to be more consistent

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

images

Delete unused icon, reorder dropdown.

2013-01-23 11:02:16 -05:00

js

Moved onclick to 'fold' button instead of to courseware's button

2013-02-13 15:10: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