Diana Huang a971e71792 Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form ...

Conflicts:
	common/djangoapps/course_modes/views.py

2014-11-04 10:50:09 -05:00

..

admin

Miscellaneous fixes to strings found during i18n work.

2014-01-03 17:50:16 -05:00

candy_res

Simple port of Class2Go's chat feature

2013-07-18 15:00:53 -07:00

coffee

WL-98

2014-10-21 14:23:46 -04:00

contrib

…

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

files

Update edX media kit (LH #221)

2013-02-28 20:16:19 -05:00

fonts/OpenSans

Replace reference to Google OpenSans with edX-hosted OpenSans

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

images

remove unused icon images

2014-10-23 14:04:15 -07:00

img

Add HTML editor for authoring bulk email message (adopted from CMS)

2013-08-29 12:40:32 -04:00

js

Add tests for the enrollment_interface

2014-10-30 17:15:26 -04:00

maintenance

TNL-633: Remove leftover Google Font reference.

2014-10-22 16:11:49 +03:00

sass

Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form

2014-11-04 10:50:09 -05:00

scripts

perform a new merge from master, resolve conflicts

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

staff

…

.gitignore

…

.hgignore

…

green-pointer.png

…

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

Use Backbone for student account and profile JS.

2014-10-08 15:50:13 -04:00

pixel.jpg

…

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