David Ormsbee eb96497cff Merge branch 'master' into feature/bk_forum_int ...

Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/courseware.html
	requirements.txt

2012-08-20 18:57:46 -04:00

..

admin

new static/admin files for django 1.4 admin

2012-08-10 15:25:42 -04:00

coffee

render time ago in front end

2012-08-20 12:04:25 -07: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

fonts

Moving LMS code into subdirectory

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

images

Merge branch 'master' of github.com:MITx/mitx into profile

2012-08-18 16:57:00 -07:00

js

render time ago in front end

2012-08-20 12:04:25 -07:00

sass

Merge branch 'master' into feature/bk_forum_int

2012-08-20 18:57:46 -04: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