Calen Pennington
|
8ddd8c14a4
|
Fix pylint/pep8 errors
|
2013-11-08 11:08:48 -05:00 |
|
Ned Batchelder
|
61b53713d2
|
Remove unused imports from lms, as detected by pylint.
|
2013-06-19 16:56:34 -04:00 |
|
Chris Dodge
|
fbbae44988
|
Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master
Conflicts:
cms/djangoapps/contentstore/views/course.py
lms/djangoapps/django_comment_client/base/views.py
lms/djangoapps/django_comment_client/management/commands/show_permissions.py
lms/djangoapps/django_comment_client/models.py
lms/djangoapps/django_comment_client/tests/test_utils.py
lms/envs/common.py
|
2013-05-20 10:22:36 -04:00 |
|
Jay Zoldak
|
ed5ad46192
|
Revert "Revert "fix merge conflict""
This reverts commit 2df3fe9344.
Conflicts:
common/static/coffee/src/discussion/utils.coffee
|
2013-05-16 10:29:33 -04:00 |
|
Chris Dodge
|
a92910db20
|
update lms to reflect where comment models.py is now in common
|
2013-05-06 16:23:32 -04:00 |
|
Diana Huang
|
2df3fe9344
|
Revert "fix merge conflict"
This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.
|
2013-04-26 12:40:35 -04:00 |
|
Kevin Chugh
|
de7b9333b7
|
add flagging premissions
|
2013-04-09 15:13:12 -04:00 |
|
Kevin Chugh
|
93978da87c
|
fixes cleanup
|
2013-04-09 14:57:43 -04:00 |
|
Kevin Chugh
|
5534d8bdce
|
fix mega merge conflicts
|
2013-03-29 07:33:52 -04:00 |
|
Your Name
|
8280c55992
|
pinning .1
|
2013-03-12 17:40:26 -04:00 |
|
Calen Pennington
|
cfae1cdf62
|
Pep8 autofixes
|
2013-02-06 11:13:50 -05:00 |
|
David Ormsbee
|
119b4206a4
|
Revert "Fix permissions bug and add test cases for django comment client permissions."
This reverts commit e745087455.
|
2013-02-05 18:42:01 -05:00 |
|
Jay Zoldak
|
e745087455
|
Fix permissions bug and add test cases for django comment client permissions.
|
2013-01-29 14:30:15 -05:00 |
|
Your Name
|
4b017e711d
|
updated models and vies f for flagging
|
2012-11-20 17:00:16 -05:00 |
|
Your Name
|
57b70092e8
|
update front end to handle flagging
|
2012-11-20 13:39:33 -05:00 |
|
Ibrahim Awwal
|
b5671e0fe9
|
Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions
|
2012-09-14 02:23:45 -07:00 |
|
Ibrahim Awwal
|
910be64aa2
|
Make pagination respect any filters or searches or sort keys. Searches and filters will
query the comment service to get their results rather than filtering threads that have
already been loaded.
|
2012-09-14 02:13:53 -07:00 |
|
Arjun Singh
|
6b8e2c78ab
|
Allow students to delete threads / respones; prepare for edit view for response comments (but not complete)
|
2012-09-13 21:58:59 -07:00 |
|
Arjun Singh
|
a83b9322ae
|
Allow for course subscriptions
|
2012-09-13 16:03:19 -07:00 |
|
Arjun Singh
|
a075cc79fd
|
remove stray import
|
2012-08-23 06:50:16 -07:00 |
|
Arjun Singh
|
7f3a4889b8
|
make discussions work for new users
|
2012-08-23 06:48:37 -07:00 |
|
David Ormsbee
|
b0894c3973
|
Fix tests for other courses - create default discussion roles on demand if they don't exist
|
2012-08-21 12:38:39 -04:00 |
|
Mike Chen
|
d56ac9a71b
|
added comment
|
2012-08-15 17:22:09 -04:00 |
|
Mike Chen
|
158e978a7e
|
added naive caching. not sure how to expire.
|
2012-08-15 17:15:08 -04:00 |
|
Rocky Duan
|
e5fe54ca5d
|
display active threads with only relevant contents
|
2012-08-15 00:46:28 -07:00 |
|
Rocky Duan
|
5009b78150
|
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into merge
Conflicts:
lms/djangoapps/django_comment_client/forum/views.py
lms/djangoapps/django_comment_client/permissions.py
lms/static/coffee/src/discussion/content.coffee
lms/static/coffee/src/discussion/utils.coffee
lms/templates/discussion/_recent_active_posts.html
lms/templates/discussion/_search_bar.html
lms/templates/discussion/_thread.html
lms/templates/discussion/_trending_tags.html
lms/urls.py
|
2012-08-14 17:32:30 -07:00 |
|
Rocky Duan
|
eef24a5ebe
|
added administrator role
|
2012-08-14 15:58:04 -07:00 |
|
Mike Chen
|
b06e31d2ed
|
fix Close Thread showing for students and empty bracket in search bar
|
2012-08-08 14:51:49 -04:00 |
|
Mike Chen
|
b2a048e6fc
|
limit permissions of a role to courses and fix bugs
|
2012-08-08 10:42:29 -04:00 |
|
Mike Chen
|
d9ffca2a31
|
vote_for_comment typo
|
2012-08-06 18:41:37 -04:00 |
|
Mike Chen
|
af656fcf21
|
use permissions to check if one can edit or relp
|
2012-08-06 15:08:47 -04:00 |
|
Mike Chen
|
3f1534eab7
|
added permission framework.
|
2012-08-06 12:58:20 -04:00 |
|