Chris Dodge
5619306c6b
add comment that the models.py file has been moved
2013-05-10 13:43:15 -04:00
Chris Dodge
11244107fd
add an empty models.py file to django_comment_client
2013-05-09 16:16:11 -04:00
Chris Dodge
57eca325d2
move some files from lms/djangoapps/django_comment_client to common/djangoapps/django_comment_common
2013-05-06 15:59:35 -04:00
Calen Pennington
a06c1a4b57
Fix warnings to actually use correct format for string interpolation
2013-04-16 11:40:04 -04:00
Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
David Ormsbee
a3a886bd0f
Revert "Add tests for django-comment-client models" (which actually had
...
a model change as well)
This reverts commit 053547453e
2013-02-05 18:51:16 -05:00
Jay Zoldak
053547453e
Add tests for django-comment-client models
2013-01-29 14:45:35 -05:00
Chris Dodge
dfbe7dd4f9
fix merge problem. assign_default_role() ended up being defined twice as that code was added in both master and cms-master branches, but the merge didn't pick it up as a conflict
2013-01-24 15:54:02 -05:00
Chris Dodge
22695d80c7
Merge branch 'master' into feature/cdodge/cms-master-merge4
...
Conflicts:
common/djangoapps/student/models.py
common/lib/capa/capa/responsetypes.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/xml_module.py
jenkins/test.sh
lms/djangoapps/courseware/access.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/django_comment_client/models.py
requirements.txt
2013-01-17 09:15:37 -05:00
Calen Pennington
9853c6323f
Remove circular dependencies that connect student.models and django_comment_client
...
Includes removal of "from django_comment_client.models import Role" from common/djangoapps/student/models.py
Conflicts:
common/djangoapps/student/models.py
2013-01-10 23:32:48 -05:00
Chris Dodge
7229a9cdaf
perform a new merge from master, resolve conflicts
2013-01-03 10:43:03 -05:00
Brian Wilson
8d0eb7f1a1
Respond to feedback (esp. use of .format())
2012-11-26 15:43:18 -05:00
Brian Wilson
57cb8c1e21
Add unit tests
2012-11-20 15:56:18 -05:00
Brian Wilson
ee7a8494e6
finish basic implementation of forum admin on instructor dash
2012-11-19 14:59:34 -05:00
David Ormsbee
8a453e99ca
Implement basic ability to close off a forum for a given course such that Students can no longer post or edit, but can still view.
2012-11-01 04:37:16 -04:00
Rocky Duan
eef24a5ebe
added administrator role
2012-08-14 15:58:04 -07:00
Mike Chen
b2a048e6fc
limit permissions of a role to courses and fix bugs
2012-08-08 10:42:29 -04:00
Mike Chen
3f1534eab7
added permission framework.
2012-08-06 12:58:20 -04:00
