Mike Chen 7c22a39aca Merge branch 'master' of github.com:dementrock/mitx into ccp0101/performance ...

Conflicts:
	common/lib/xmodule/xmodule/discussion_module.py
	lms/djangoapps/django_comment_client/forum/views.py
	lms/templates/discussion/_thread.html
	lms/urls.py

2012-08-15 11:05:20 -04:00

..

admin

new static/admin files for django 1.4 admin

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

coffee

Merge branch 'master' of github.com:dementrock/mitx into ccp0101/performance

2012-08-15 11:05:20 -04:00

contrib

Moving LMS code into subdirectory

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

css

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

2012-07-31 11:26:17 -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 merge

2012-08-14 17:48:08 -07:00

js

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

2012-08-14 17:48:08 -07:00

sass

display active threads with only relevant contents

2012-08-15 00:46:28 -07: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