David Ormsbee 42e0ec403e Merge pull request #2251 from edx/release ...

Merging Release 2014-01-21

2014-01-21 12:41:05 -08: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

Internationalize the forums post Markdown editor

2014-01-16 14:10:51 -05:00

contrib

Moving LMS code into subdirectory

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

css/vendor

Remove defunct forum post tagging code

2014-01-14 13:03:56 -05:00

files

Update edX media kit (LH #221)

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

images

Use correct linkedin button.

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

img

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

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

js

Internationalize the forums post Markdown editor

2014-01-16 14:10:51 -05:00

maintenance

adding maintenance static data

2012-08-23 08:30:04 -04:00

sass

Internationalize the forums post Markdown editor

2014-01-16 14:10:51 -05: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

Add unit tests.

2013-12-17 13:22:08 +02: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