Victor Shnayder edf96036c8 Merge remote-tracking branch 'origin/master' into 7012x-clean

2013-02-06 18:53:14 -05:00

..

applets/capa

Replace editamolecule input type applet with GWT version

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

coffee

inline discussions working

2013-02-05 22:43:09 -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

Merge remote-tracking branch 'origin/master' into 7012x-clean

2013-02-06 18:53:14 -05:00

sass

Merge branch 'master' into feature/cdodge/cms-master-merge2

2013-01-07 12:34:48 -05:00

scripts

fix tests on merge

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