Rocky Duan 951fb06341 Merge branch 'master' of github.com:MITx/mitx into merge ...

Conflicts:
	lms/envs/dev.py

2012-08-22 14:04:34 -07:00

..

coffee

Moving a few static files out of lms into common

2012-08-07 13:39:59 -04:00

css/vendor/ui-lightness

Fixed jquery ui image problem and added a base style sheet for lms to override fonts

2012-07-31 11:06:39 -04:00

images

fixed wiki bugs; started sequence nav bugs

2012-08-21 12:51:33 -04:00

js/vendor

updated backbone & single thread retrieval now working

2012-08-20 22:03:46 -07:00