Andy Armstrong 0ed3a95d3a Merge branch 'release' ...

Conflicts:
	AUTHORS
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
	common/test/acceptance/pages/lms/dashboard.py

2014-09-25 16:25:45 -04: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

Remove client side parsing of module_id

2014-09-03 21:59:29 -04:00

contrib

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04: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

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

Prepare track selection page for new audit track

2014-09-12 13:58:13 -04:00

img

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

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

js

Add Django apps for student account and profile.

2014-09-25 08:36:22 -04:00

maintenance

Set the html language to the browser's specified language

2014-01-28 16:43:29 -05:00

sass

Merge branch 'release'

2014-09-25 16:25:45 -04:00

scripts

perform a new merge from master, resolve conflicts

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

staff

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

.gitignore

Added Gemfile.lock to ignore

2012-07-30 09:51:50 -04:00

.hgignore

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

green-pointer.png

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

js_test.yml

Added jasmine tests and factored out javascript functions to new file

2014-04-23 14:56:32 -04:00

pixel.jpg

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

xmodule_js

Integrate js-test-tool into testing infrastructure

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