Commit Graph

385 Commits

Author SHA1 Message Date
Victor Shnayder
2af06ef1d4 Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes"
This reverts commit 66889b8724, reversing
changes made to 0dd9c24e74.

This was merged too early--it's still missing the filtering and display-your-cohort changes.
Will need to revert this revert later.
2013-02-06 20:29:17 -05:00
Victor Shnayder
884a7a61b9 Revert "Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes"
This reverts commit 965e3b4c49, reversing
changes made to 1a7d2a06a8.

I accidentally merged this before it was ready.  This was silly, so now I'm undoing it.  We'll need to revert the revert later.
2013-02-06 20:27:01 -05:00
Kevin Chugh
1dd0ef274d addressed somme comments in pull request and instructor fixes and blank group fix 2013-02-06 18:26:41 -05:00
Your Name
6b4a1dfd34 minor tweaks after testing 2013-02-06 12:54:06 -05:00
Kevin Chugh
c7a133470d inline discussions working 2013-02-05 22:43:09 -05:00
Your Name
d5b70d7bfc inline cohorting working 2013-02-05 18:38:06 -05:00
Kevin Chugh
3009acbb10 showing group names 2013-02-04 14:50:53 -05:00
Kevin Chugh
69225f6435 cohort ID showing, have to translate to display text 2013-02-04 08:33:33 -05:00
Kevin Chugh
fcbd4bd1cd produce and consume group_id from dropdowns 2013-02-02 05:46:11 -05:00
Your Name
8fd32ed502 update to show cohort name on create and cohort name on view all threads, added cohort dictionary to convert ids to names 2013-02-01 13:01:54 -05:00
Your Name
3fa67c1425 allow moderators and students to select cohort on post creation 2013-01-31 17:05:15 -05:00
Your Name
1fc26de945 merge master 2013-01-30 15:19:43 -05:00
Your Name
5bfd2c33b0 send cohort to post view context 2013-01-29 17:34:52 -05:00
Your Name
3404011f16 update front end to support selection and display of cohort ids 2013-01-29 17:23:08 -05:00
marco
7b12dac021 added make visible to menu, and visibility description to threads 2013-01-22 15:47:23 -05:00
marco
2b23c40345 minor tweaks to dropdown text and addition of dropdown menu (without data links) for intructor visilibility dropdown in main discussion forum; 2013-01-17 15:25:35 -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
Arjun Singh
6fbf2f9720 revert toString changes; use attr('data-id') instead of data('id') when mongo ids are involved 2012-10-12 04:22:27 -07:00
Arjun Singh
58b0829b79 Fix some issues with integer ids in the discussion forum 2012-10-11 06:22:00 -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
Ibrahim Awwal
d1e8f4c016 Properly puluralize comments tooltip and change "unread" to "new". 2012-09-20 04:53:02 -07:00
Ibrahim Awwal
afdd11342e Show total comments instead of unread only, and use a tooltip to show the unread count. 2012-09-20 04:26:58 -07:00
Arjun Singh
6132b9b207 Alter some css; don't send the user if there is no user when retrieivng a thread 2012-09-20 02:11:27 -07:00
Rocky Duan
f6efa99f6c unread count tracking 2012-09-19 06:15:48 -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
Ibrahim Awwal
151dbda242 Fix followed state not showing up on initial forum load in sidebar. 2012-09-18 04:09:38 -07:00
Ibrahim Awwal
aa301a805e Converted tooltips to coffee too, and removed both converted files from the included js header. 2012-09-17 19:19:09 -07:00
Ibrahim Awwal
bb6f4cdb2e Move dropdown filter into a more clearly named file, discussion-filter.js, and move the
event bindings into the proper views.
2012-09-17 18:08:44 -07:00
Ibrahim Awwal
680e681fee Removed a lot of dead code and moved tooltips into their own file. 2012-09-17 18:08:43 -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
3b13013ecc Merge whitespace fix 2012-09-15 02:14:01 -07:00
Arjun Singh
4efe1135cb fix up whitespace causing weirdness in inline response comment rendering 2012-09-15 02:12:52 -07:00
Ibrahim Awwal
c47f0ffb47 Hopefully fix code formatting showing up on comments? But it doesn't seem to happen everywhere... 2012-09-15 00:42:47 -07:00
Arjun Singh
b5351cc584 Support legacy anonymity 2012-09-14 21:59:09 -07:00
Rocky Duan
3e241182c7 Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions 2012-09-14 17:22:26 -07:00
Rocky Duan
9c19f64c01 for students, only display endorse icon if endorsed 2012-09-14 17:22:11 -07:00
Ibrahim Awwal
17c3dd913e Tooltips on follow and vote. 2012-09-14 16:55:16 -07:00
Arjun Singh
b2c88575ee fix deep comment links 2012-09-14 15:38:48 -07:00
Arjun Singh
190f25c0dd Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions 2012-09-14 13:35:43 -07:00
Arjun Singh
3756d31761 Placeholder for wmd editors; specifically comment form 2012-09-14 13:20:54 -07:00
Tom Giannattasio
7b7ad3d8c2 new paragraph styles for comments 2012-09-14 16:07:45 -04:00
arjun810
0ad3e8a7b0 Merge pull request #692 from MITx/feature/dave/new-discussions
Small fixes
2012-09-14 13:06:53 -07:00
David Ormsbee
a32be2958c Change 'View discussion' link on user profile page to be a simple link rather than AJAX. 2012-09-14 16:00:09 -04:00
Arjun Singh
387c8ea1b5 make wmd editor for comments 2012-09-14 12:46:48 -07:00
David Ormsbee
820003b96c Prevent showing redundant roles for this user 2012-09-14 14:29:17 -04:00
Tom Giannattasio
19c5895cbe tweaked profile posted details template 2012-09-14 11:30:51 -04: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
2d58f8dea1 Fix load more pages button on single thread. 2012-09-14 02:37:46 -07:00
Arjun Singh
b6f9dcdf74 fix inline closed threads 2012-09-14 01:25:02 -07:00