Chris Dodge 27d7c19c40 Merge branch 'release' ...

Conflicts:
	cms/templates/widgets/source-edit.html

2014-04-14 14:17:03 -04:00

..

applets/capa

Replace editamolecule input type applet with GWT version

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

coffee

Return 404 instead of 500 for missing forum thread

2014-04-10 13:17:58 -04:00

css

Revert "updated pdf viewer"

2014-04-08 12:59:04 -04:00

data/geoip

Embargo Middleware feature

2014-02-27 08:37:58 -05:00

fonts

adds/relocates shared vendor css (and assets) to static directories

2013-10-16 16:45:32 -04:00

images

Upgrade to TinyMCE 4.0.16.

2014-04-02 10:35:27 -04:00

js

Revert "updated pdf viewer"

2014-04-08 12:59:04 -04:00

sass

fixed mixin sass

2014-04-09 10:32:12 -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

js_test.yml

Add repsonse pagination to inline discussions

2014-04-02 14:32:58 -04:00