cahrens 6629d5d3a3 Merge branch 'master' into talbs/studio-authorship ...

Conflicts:
	cms/djangoapps/contentstore/views/user.py
	cms/static/sass/elements/_controls.scss
	cms/templates/activation_active.html
	cms/templates/activation_complete.html
	cms/templates/activation_invalid.html

2013-07-22 12:15:42 -04:00

..

applets/capa

Replace editamolecule input type applet with GWT version

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

coffee

Remove use of keyword "delete" in forum coffee code to fix IE8 bug LMS-441.

2013-07-10 17:54:13 -04:00

css

layout cleanup on LMS PDF Textbook viewer

2013-07-11 11:19:39 -04:00

images

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

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

js

Added support for a new problem type: ChoicetextResponse

2013-07-18 10:12:56 -07:00

sass

Merge branch 'master' into talbs/studio-authorship

2013-07-22 12:15:42 -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