Ned Batchelder 9a106a32d5 Merged master to rc/2013-11-21

2013-11-25 14:56:09 -05:00

..

admin

Pep8 autofixes

2013-02-06 11:13:50 -05:00

candy_res

Simple port of Class2Go's chat feature

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

coffee

Merged master to rc/2013-11-21

2013-11-25 14:56:09 -05:00

contrib

…

css/vendor

LMS: resolves incorrectly named vendor CSS files

2013-10-17 13:37:15 -04:00

files

Update edX media kit (LH #221)

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

fonts

adds/relocates shared vendor css (and assets) to static directories

2013-10-16 16:45:32 -04:00

images

edx.org/LMS: revises graphic-based login and registration banner text to render with system text

2013-09-25 16:00:08 -04:00

img

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

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

js

Removed unused code

2013-11-13 20:57:19 +00:00

maintenance

adding maintenance static data

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

sass

Merged master to rc/2013-11-21

2013-11-25 14:56:09 -05:00

scripts

perform a new merge from master, resolve conflicts

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

staff

…

.gitignore

Added Gemfile.lock to ignore

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

.hgignore

…

green-pointer.png

…

js_test.yml

optimize keyboard focus management on dashboard's modals

2013-10-22 13:26:18 -04:00

pixel.jpg

…

xmodule_js

Integrate js-test-tool into testing infrastructure

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