Will Daly 5085b71677 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form ...

Conflicts:
	common/djangoapps/third_party_auth/pipeline.py
	lms/djangoapps/verify_student/tests/test_views.py

2014-11-10 15:05:37 -05:00

..

applets/capa

Replace editamolecule input type applet with GWT version

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

coffee

Merge pull request #5610 from mlkwaqas/waqas/tnl607-forum-post-are-uneditable

2014-10-20 19:39:29 +05:00

css

Annotation Tools: CSS fixes for editor

2014-10-15 16:24:25 -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

Last reference removed in 3b2c970248 [OPEN-299]

2014-11-07 09:50:45 -05:00

js

Fix Jasmine test

2014-11-10 11:25:39 -05:00

sass

Studio: cleaning up/removing unused sass

2014-10-30 12:07:52 -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

Jasmine tests of validation utility

2014-11-07 10:44:25 -05:00