Calen Pennington 029d8c8085 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged ...

Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py

2013-03-15 09:46:47 -04:00

..

admin

Pep8 autofixes

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

coffee

Fix some minor bugs in event handling and add enter key support

2013-02-22 09:47:50 -05:00

contrib

Moving LMS code into subdirectory

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

css/vendor

Standardize more of css between lms and cms

2012-10-01 15:17:40 -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

Add 2.01x announcement to news feed

2013-03-14 06:49:07 -07: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

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-15 09:46:47 -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