Chris Dodge
7229a9cdaf
perform a new merge from master, resolve conflicts
2013-01-03 10:43:03 -05:00
Calen Pennington
7977491ddf
WIP: LMS Courseware appears to be working
2012-12-28 14:51:50 -05:00
Calen Pennington
7e224f5847
Convert a bunch more references from metadata to fields
2012-12-28 14:45:46 -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
Kevin Chugh
6e108c7531
fix conflict
2012-12-10 19:30:04 -05:00
Kevin Chugh
368b59a9e6
updated tooltips
2012-12-07 15:39:53 -05:00
Kevin Chugh
258b1fe9a5
thread responses create fixed
2012-12-06 22:12:17 -05:00
Kevin Chugh
14b0cc019f
remove debug placeholders, finalize render of comments, flagging working on posts, replies, and comments
2012-12-06 16:26:08 -05:00
Kevin Chugh
deb3888a84
thread response flagging
2012-12-06 14:13:54 -05:00
Kevin Chugh
70b0b5beb8
update models
2012-12-06 10:43:51 -05:00
Kevin Chugh
4139f702ff
debugging thread
2012-12-06 10:30:06 -05:00
Kevin Chugh
28e86f9602
Merge branch 'master' into feature/kevin/flagging
2012-12-06 09:31:39 -05:00
Kevin Chugh
50db11a647
urls and views for comment flagging
2012-12-05 17:08:29 -05:00
Kevin Chugh
4dee832f35
convert flagging to one flag
2012-12-02 13:04:27 -05:00
Brian Wilson
8d0eb7f1a1
Respond to feedback (esp. use of .format())
2012-11-26 15:43:18 -05:00
Your Name
4b017e711d
updated models and vies f for flagging
2012-11-20 17:00:16 -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
Your Name
57b70092e8
update front end to handle flagging
2012-11-20 13:39:33 -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
