Adam 58e6dcf79c Merge pull request #5107 from edx/adam/resolve-merge-conflicts ...

Adam/resolve merge conflicts

2014-09-05 14:55:24 -04:00

..

applets/capa

Replace editamolecule input type applet with GWT version

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

coffee

Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts

2014-09-05 13:20:15 -04:00

css

Replace reference to Google OpenSans with edX-hosted OpenSans

2014-08-27 10:34:53 -04:00

data/geoip

Support ipv6 in geoinfo and Embargo

2014-08-14 16:13:35 +08: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

Mathjax should be used after complete loading

2014-09-05 17:19:48 +05:00

sass

Studio: revising %cont-text-sr Sass placeholder based on modern browser support

2014-08-20 14:48:37 -04:00

scripts

fix tests on merge

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

templates

Implement forum cohort visibility labels correctly

2014-09-04 13:47:48 -04:00

.gitignore

Ignore compiled xmodule assets

2013-04-18 15:46:08 -04:00

js_test.yml

Implement forum cohort visibility labels correctly

2014-09-04 13:47:48 -04:00