Rocky Duan 690d97f28b fixed merge bugs

2012-08-07 18:49:59 -04:00

..

base

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

2012-08-07 11:31:26 -04:00

forum

Merge branch 'master' into merge

2012-08-07 16:49:54 -04:00

migrations

added permission framework.

2012-08-06 12:58:20 -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 permission framework.

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

permissions.py

use permissions to check if one can edit or relp

2012-08-06 15:08:47 -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 merge bugs

2012-08-07 18:49:59 -04:00