David Ormsbee 40d59faa68 Merge pull request #1330 from MITx/diana/open-ended-ui-updates ...

Rubric Integration and other UI improvements

2013-01-29 14:10:18 -08:00

..

admin

perform a new merge from master, resolve conflicts

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

coffee

Merge pull request #1330 from MITx/diana/open-ended-ui-updates

2013-01-29 14:10:18 -08:00

contrib

…

css/vendor

Standardize more of css between lms and cms

2012-10-01 15:17:40 -04:00

files

Update media kit download (LH #168)

2013-01-27 17:50:53 -05:00

fonts

…

images

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2013-01-22 14:47:52 -05:00

js

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

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

maintenance

…

sass

Merge pull request #1330 from MITx/diana/open-ended-ui-updates

2013-01-29 14:10:18 -08:00

scripts

perform a new merge from master, resolve conflicts

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

staff

…

.gitignore

…

.hgignore

…

green-pointer.png

…

pixel.jpg

…