Rocky Duan 5009b78150 Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into merge ...

Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
	lms/djangoapps/django_comment_client/permissions.py
	lms/static/coffee/src/discussion/content.coffee
	lms/static/coffee/src/discussion/utils.coffee
	lms/templates/discussion/_recent_active_posts.html
	lms/templates/discussion/_search_bar.html
	lms/templates/discussion/_thread.html
	lms/templates/discussion/_trending_tags.html
	lms/urls.py

2012-08-14 17:32:30 -07:00

..

admin

new static/admin files for django 1.4 admin

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

coffee

Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into merge

2012-08-14 17:32:30 -07: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 12:54:43 -07:00

js

adjust new post button in forum view

2012-08-14 12:43:15 -07:00

sass

similar post and search highlight

2012-08-14 17:18:07 -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