marco 81a2ac413d Merge branch 'release' ...

Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py

2013-10-01 17:05:02 -04: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

Merge pull request #1161 from edx/gprice/forums-labels

2013-09-27 11:37:45 -07:00

contrib

…

css/vendor

update annotator.min.css with change to fix adder button and serve the minified one.

2013-05-16 14:48:06 -04:00

files

Update edX media kit (LH #221)

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

fonts

added in vendor font references to lms for font-awesome

2013-07-22 10:10:23 -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

Merge pull request #975 from edx/gprice/markdown-button-taborder

2013-09-20 10:38:57 -07:00

maintenance

…

sass

Merge branch 'release'

2013-10-01 17:05:02 -04: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.yml

Integrate js-test-tool into testing infrastructure

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

pixel.jpg

…

xmodule_js

Integrate js-test-tool into testing infrastructure

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