Rocky Duan 700594263e Merge branch 'brittany' of github.com:dementrock/mitx into profile & ...

small fix

Conflicts:
	lms/templates/discussion/user_profile.html

2012-08-14 16:52:43 -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

added administrator role

2012-08-14 15:58:04 -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

a place to start for the user profiel & fixed some bugs

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