Calen Pennington 9feff62857 Merge pull request #3834 from cpennington/ok-merge-from-master ...

Merge master into opaque-keys

2014-05-23 11:36:52 -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

Merge pull request #3834 from cpennington/ok-merge-from-master

2014-05-23 11:36:52 -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

…

images

Remove press-page machinery and assets

2014-05-06 13:29:17 -04:00

img

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

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

js

Revert "Handle the indexerror exception on create_order"

2014-05-20 18:33:54 +05:00

maintenance

Set the html language to the browser's specified language

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

sass

Fixes issue with metrics tab click handlers

2014-05-15 11:45:59 -07:00

scripts

…

staff

…

.gitignore

…

.hgignore

…

green-pointer.png

…

js_test.yml

Added jasmine tests and factored out javascript functions to new file

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

pixel.jpg

…

xmodule_js

Integrate js-test-tool into testing infrastructure

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