Diana Huang dd20226ec3 Merge branch 'master' into feature/diana/rubric-input ...

Fix some merge issues involving rubric rendering

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py
	common/lib/xmodule/xmodule/open_ended_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py

2013-01-18 16:36:22 -05:00

..

admin

removed .idea files

2012-11-29 16:11:48 -05:00

coffee

Merge branch 'master' into feature/diana/rubric-input

2013-01-16 09:02:51 -05:00

contrib

Moving LMS code into subdirectory

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

css/vendor

Fix errors that were preventing collectstatic from running

2012-08-19 22:31:05 -04:00

files

Add content and assets for media kit

2013-01-03 13:28:45 -05:00

fonts

Moving LMS code into subdirectory

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

images

Update FAQ page: new content and styling

2013-01-14 14:17:39 -05: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 branch 'master' into feature/diana/rubric-input

2013-01-18 16:36:22 -05:00

scripts

ie7 fixes: define indexOf, use charAt rather than [] to access string,

2012-12-19 10:48: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