Adam Palay bfcfbfab2f Merge remote-tracking branch 'origin/release' into merge-release-into-master ...

Conflicts:
	requirements/edx/github.txt

2015-01-30 09:44:42 -05:00

..

applets/capa

Replace editamolecule input type applet with GWT version

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

coffee

Merge pull request #6443 from open-craft/kelketek/hide-irrelevant-cohort-menu

2015-01-29 11:49:33 -05:00

css

TNL-213: Let Students Add Personal Notes to Course Content.

2015-01-14 23:34:11 +02:00

data/geoip

Support ipv6 in geoinfo and Embargo

2014-08-14 16:13:35 +08:00

fonts

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

2015-01-06 15:24:12 -05:00

images

Placeholder image for Open edX Studio logo, when not running on edx.org

2015-01-08 12:42:26 -05:00

js

Disable referrer (TNL-1144)

2015-01-29 09:53:55 -05:00

sass

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

2015-01-06 15:24:12 -05: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

Teach LMS how to render XBlockAsides

2014-12-13 08:26:28 -05:00