Adam Palay 89795191cb Merge remote-tracking branch 'origin/release' ...

Conflicts:
	cms/envs/common.py
	lms/envs/common.py

2014-02-27 17:33:40 -05:00

..

applets/capa

…

coffee

Merge pull request #2724 from edx/will/studio-xblock-save

2014-02-27 10:50:51 -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

fixed conflict between Annotator and internationalitation

2014-02-06 16:31:02 +01: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

…

.gitignore

…

js_test.yml

Internationalize forums CoffeeScript code

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