Rocky Duan 238adb1a03 Merge branch 'master' into profile ...

Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
	lms/templates/course_navigation.html

2012-08-18 17:04:37 -07:00

..

base

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

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

forum

Merge branch 'master' into profile

2012-08-18 17:04:37 -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

added comment

2012-08-15 17:22:09 -04: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

fixed vote permission

2012-08-15 18:04:56 -07:00