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
Calen Pennington
96daea5c0a
Ignore discussion modules with missing keys when building the global discussion info
2012-12-12 09:40:31 -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
619ac10069
Merge remote-tracking branch 'origin/master' into feature/brian/dashboard-manage-mods
2012-11-20 15:46:49 -05:00
Brian Wilson
ee7a8494e6
finish basic implementation of forum admin on instructor dash
2012-11-19 14:59:34 -05:00
Arjun Singh
d9b553b378
Adding a better command for assigning roles.
2012-11-05 15:29:49 -08:00
David Ormsbee
d1aa0a254e
Use one of our test courses when testing course permissions for the discussion client, because we now have course policy level overrides.
2012-11-02 17:21:00 -04: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
Carlos Andrés Rocha
3e2cf18772
Add some extra console commands for handling user permissions
2012-10-23 16:11:07 -04:00
Arjun Singh
71201a73b2
styles and tiny bit of logic for community tas
2012-10-12 04:54:56 -07:00
Ibrahim Awwal
ad7e84ad0e
Fix forums in IE9; apparently it's just very strict about the charset being a valid identifier. utf8 is not a valid identifier, utf-8 is.
2012-09-22 23:01:34 -07:00
Arjun Singh
8fb6204073
Better fix for trailing slash
2012-09-21 05:42:51 -07:00
Ibrahim Awwal
939b927fbd
Merge branch 'master' into feature/ibrahim/followed-threads
...
Conflicts:
lms/djangoapps/django_comment_client/forum/views.py
2012-09-20 23:55:13 -07:00
Arjun Singh
55a9da933a
DRY things slightly
2012-09-20 02:15:51 -07:00
Arjun Singh
3567e23a9d
Unneeded imports
2012-09-20 02:13:35 -07:00
Arjun Singh
117c0b6927
Mark threads as read once they are fetched; change viewed to read
2012-09-20 00:24:36 -07:00
Rocky Duan
f6efa99f6c
unread count tracking
2012-09-19 06:15:48 -07:00
David Ormsbee
0b3ae9052a
Make the default topic a dict so it doesn't error on courses that don't specify topics
2012-09-18 19:19:08 -04:00
Ibrahim Awwal
6315fe3fe6
Allow sorting followed threads (works same as sorting anything else).
2012-09-18 14:50:38 -07:00
Ibrahim Awwal
53a1611eee
Change following=>followed.
2012-09-18 14:50:14 -07:00
Ibrahim Awwal
ef8ca23dee
Fix pagination and sorting for followed threads. Also fixed sorting so that it always retrieves a new set of threads from the server for the initial set.
2012-09-18 04:35:32 -07:00
Ibrahim Awwal
a444166d98
Add a followed threads entry to the topic dropdown in the discussion sidebar.
...
Also fixed up some random bugs with content_info, and changed pagination code a little. Needs comments service update for the subscribed threads API call.
2012-09-18 04:09:38 -07:00
Arjun Singh
90f37b3344
Don't use the search API to retrieve all threads.
2012-09-17 14:10:58 -07:00
Arjun Singh
b5351cc584
Support legacy anonymity
2012-09-14 21:59:09 -07:00
Arjun Singh
033ce7ef42
Discussioninfo needs to be multicourse-friendly..
2012-09-14 18:34:37 -07:00
David Ormsbee
ce9fc9ceab
Don't explode if a forum content piece is by a user that doesn't exist
2012-09-14 17:25:12 -04:00
Arjun Singh
f656da46ec
bump inline count, fix tiny bug for server startup
2012-09-14 06:00:01 -07:00
Arjun Singh
edf02dd90e
Fix context links for the 123187th time
2012-09-14 04:07:04 -07:00
Arjun Singh
8f63ec4d44
merge
2012-09-14 02:56:34 -07:00
Arjun Singh
fff7bcc5a7
Remove more tags; anonymity to peers
2012-09-14 02:50:08 -07:00
Ibrahim Awwal
154cb843dd
Bump up threads per page again, because I don't think showing 5 threads at a time is
...
particularly useful.
2012-09-14 02:48:49 -07:00
Ibrahim Awwal
2d58f8dea1
Fix load more pages button on single thread.
2012-09-14 02:37:46 -07: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
9197efc3a1
Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions
2012-09-13 21:59:09 -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
Ibrahim Awwal
4d59013955
Remove dead code.
2012-09-13 19:58:17 -07:00
Arjun Singh
e4c7a5ea97
Fix courseware context links; filter out unstarted topics.
2012-09-13 19:41:07 -07:00
Arjun Singh
a83b9322ae
Allow for course subscriptions
2012-09-13 16:03:19 -07:00
Matthew Mongeau
5b9967e5a0
Paging wip
2012-09-13 17:35:29 -04:00
Ibrahim Awwal
58fc3eca12
Fix staff markers for inline threads and double staff markers for threads with deeply nested comments.
2012-09-13 02:20:35 -07:00
Ibrahim Awwal
712e59a68d
Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions
...
Conflicts:
lms/djangoapps/django_comment_client/forum/views.py
lms/static/sass/_discussion.scss
2012-09-12 15:18:34 -07:00
Ibrahim Awwal
b4828db1e3
User profile page redone to act like the inline discussion, except threads are
...
loaded into the page in a data attribute instead of loaded on request via ajax.
The user profile page also does not provide facilities for adding
comments/responses, which I think would clutter the page too much.
Also removed some unused stuff from views.py.
2012-09-12 15:16:35 -07:00
Carlos Andrés Rocha
18b5a1f5a2
Temporary fix to get the discussion profile page rendering
2012-09-12 13:20:04 -04:00
Matthew Mongeau
1a402f7fda
Mark responses and comments as staff
2012-09-12 11:09:36 -04:00
Arjun Singh
a900998145
Fix anonymity leak; fix editing when rendering from main page.
2012-09-12 04:32:32 -07:00
Ibrahim Awwal
3bc9c7496c
Update discussion setup instructions to clarify that you need to specify a
...
course id for seed_permissions_roles, and also the script itself to tell you that.
2012-09-11 19:15:18 -07:00
Ibrahim Awwal
f97d4fe983
Add @login_required to forum views so that they redirect to a login page if you're not logged in.
2012-09-11 13:41:30 -07:00
Ibrahim Awwal
7e96f668c0
Render courseware context after creating a new post.
2012-09-11 04:28:24 -07:00
