Kevin Chugh ef3204da69 Merge pull request #2059 from edx/feature/zoldak/forum-testing ...

Feature/zoldak/forum testing

2013-05-17 10:10:55 -07:00

..

admin

Pep8 autofixes

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

coffee

turn off notes js debugging

2013-05-06 19:35:41 -04:00

contrib

Moving LMS code into subdirectory

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

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

Moving LMS code into subdirectory

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

images

updated flagging icons to not use other libraries

2013-05-16 10:56:58 -04:00

js

Restore /faq page, and moved new content to /help

2013-01-17 10:47:50 -05:00

maintenance

adding maintenance static data

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

sass

cursor state for discussions (not inline) span text needed to be set to pointer

2013-05-16 10:29:34 -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

pixel.jpg

Moving LMS code into subdirectory

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