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

..

candy_res

Remove unused static assets

2014-11-01 00:11:23 -04:00

coffee

fixup! Remove "ADMIN_MEDIA_PREFIX" (deprecated in Django 1.4)

2014-11-03 16:49:18 -05:00

css/vendor

As per request #2898, changed the css for annotator tool to affect tinymc only when in annotator-wrapper.

2014-03-12 17:09:20 -04:00

fonts/OpenSans

Replace reference to Google OpenSans with edX-hosted OpenSans

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

images

Last references removed in 982d22df38

2014-11-07 12:57:37 -05:00

js

Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form

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

sass

Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form

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

scripts

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

.gitignore

…

.hgignore

…

js_test_coffee.yml

Support adding students to a cohort via the instructor dashboard.

2014-10-01 09:22:31 -04:00

js_test.yml

Fix logistration Jasmine tests

2014-11-06 12:07:49 -05:00

templates

Show cohorts on the new instructor dashboard

2014-10-01 09:22:29 -04:00

xmodule_js

Integrate js-test-tool into testing infrastructure

2013-08-26 20:21:18 -04:00