Julian Arni bc25defd10 Merge branch 'master' into feature/jkarni/jsinput ...

Conflicts:
	doc/public/index.rst

2013-06-24 10:46:19 -04:00

..

applets/capa

Replace editamolecule input type applet with GWT version

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

coffee

Abridge tests in light of learning how Segment.io works

2013-06-18 17:58:10 -04:00

css

Merge branch 'master' into feature/jkarni/jsinput

2013-06-24 10:46:19 -04:00

images

Merge pull request #1908 from MITx/fix/btalbot/studio-courseinfo

2013-04-30 13:34:52 -07:00

js

Merge branch 'master' into feature/jkarni/jsinput

2013-06-24 10:46:19 -04:00

sass

studio - revising the visual design of UI well pattern

2013-06-20 12:30:25 -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