Han Su Kim bdfd81d2f3 Merge remote-tracking branch 'origin/master' into release, conflicts resolved ...

Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt

2014-03-06 16:56:16 -05: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/master' into release, conflicts resolved

2014-03-06 16:56:16 -05:00

css

fixed missing polyfill buttons, adjusted layout of number input in component editor

2014-02-11 15:20:00 -05: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

Removed unused image

2014-02-12 21:49:05 +00:00

js

Upgrade CodeMirror to 3.21.0 (with accessibility changes from

2014-02-28 13:44:34 -05:00

sass

styling for recursive xblock rendering structure to be used in the container page, pulling from general xblock styles in a separate file.

2014-02-14 12:57:06 -05: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

Internationalize forums CoffeeScript code

2014-01-14 13:04:51 -05:00