Rocky Duan
|
fd0eff46e7
|
Merge branch 'feature/rocky/discussion_api_key' into refactor
Conflicts:
lms/djangoapps/django_comment_client/tests.py
lms/lib/comment_client/utils.py
lms/templates/courseware/courseware.html
|
2012-08-21 17:14:25 -07:00 |
|
David Ormsbee
|
1c84f8e2dd
|
Remove student removal (we shouldn't ever delete users)
|
2012-08-21 13:00:06 -04:00 |
|
David Ormsbee
|
6d371640d4
|
Removed signal removal in django_comment_client test (we're no longer doing user replication)
|
2012-08-21 12:04:24 -04:00 |
|
Rocky Duan
|
0b3e9909a4
|
Merge branch 'master' into refactor
Conflicts:
lms/djangoapps/django_comment_client/tests.py
lms/static/coffee/src/discussion/content.coffee
requirements.txt
|
2012-08-20 15:35:31 -07:00 |
|
Rocky Duan
|
dc599c469f
|
fixed test
|
2012-08-20 15:26:07 -07:00 |
|
Rocky Duan
|
71df263ff9
|
disable all course db related signals
|
2012-08-20 11:57:58 -07:00 |
|
Rocky Duan
|
1f50da8814
|
fixed discussion permission test
|
2012-08-20 11:41:36 -07:00 |
|
Mike Chen
|
3f1534eab7
|
added permission framework.
|
2012-08-06 12:58:20 -04:00 |
|