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

..

base

Merge branch 'brittany' of github.com:dementrock/mitx into profile &

2012-08-14 16:52:43 -07:00

forum

fixed bug caused by missing course_id in retrieved comments

2012-08-14 15:57:02 -07:00

management

added administrator role

2012-08-14 15:58:04 -07:00

migrations

limit permissions of a role to courses and fix bugs

2012-08-08 10:42:29 -04:00

__init__.py

added permission framework.

2012-08-06 12:58:20 -04:00

middleware.py

middleware file forgot to include

2012-07-30 17:17:09 -04:00

models.py

added administrator role

2012-08-14 15:58:04 -07:00

permissions.py

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

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

tests.py

added permission framework.

2012-08-06 12:58:20 -04:00

urls.py

moved django_comment_client into edx

2012-07-25 18:15:51 -04:00

utils.py

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

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