Commit Graph

658 Commits

Author SHA1 Message Date
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
Arjun Singh
1f55763b56 Removing tags for now 2012-09-14 00:44:31 -07:00
Arjun Singh
8506cbcd15 Response editing 2012-09-14 00:11:32 -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
e4c7a5ea97 Fix courseware context links; filter out unstarted topics. 2012-09-13 19:41:07 -07:00
Matthew Mongeau
5b9967e5a0 Paging wip 2012-09-13 17:35:29 -04:00
Tom Giannattasio
bcb7ad343c fixed anonymous inline bug 2012-09-13 11:25:55 -04:00
Tom Giannattasio
a152041ef8 fixed inline thread replace error 2012-09-13 10:25:10 -04:00
Tom Giannattasio
85abb71398 styles for inline comment count 2012-09-13 10:13:49 -04:00
Tom Giannattasio
b3335ec551 brought vote button back to collapsed inline discussions 2012-09-13 10:08:31 -04:00
Ibrahim Awwal
62b047f3c2 Refactored DiscussionThreadInlineView to inherit from DiscussionThreadView and
use subviews for rendering. Functionality should be the same. Changed a few things
in DiscussionThreadView to make this a little easier.
2012-09-13 03:11:30 -07: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
d9018658b7 Remove whitespace around post body in edit template.
Extra spaces actually get added to a post when activating a WMD editor which can
get saved into the post if you click update.
2012-09-13 00:13:34 -07:00
Ibrahim Awwal
8c9febe549 Add quotes to fix thread editor title bug. 2012-09-12 20:55:55 -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
Tom Giannattasio
1d71a2cfbd tweaked usernames so they were more prominent throughout 2012-09-12 13:40:11 -04:00
Matthew Mongeau
1a402f7fda Mark responses and comments as staff 2012-09-12 11:09:36 -04:00
Tom Giannattasio
ff94541e40 tweaked inline hide/show and new post buttons 2012-09-12 09:41:34 -04:00
Ibrahim Awwal
2d105265f9 Add @references for deeply nested (3+) comments. 2012-09-11 05:43:21 -07:00
Ibrahim Awwal
ce16d22451 Fix anonymous posts on the inline discussion view. 2012-09-11 04:09:53 -07:00
Ibrahim Awwal
b60feb164c Remove user_id from content renderer although I'm 99.9% sure this isn't
used anywhere anyway.
2012-09-11 01:51:16 -07:00
Ibrahim Awwal
45ba58318f Hide usernames for anonymous posts. 2012-09-11 01:33:59 -07:00
Arjun Singh
a49b638027 Edit post works now. 2012-09-11 01:07:03 -07:00
Ibrahim Awwal
c2f741c392 Revert "Disable posting anonymously for now."
This reverts commit 6ee6e1c656.
2012-09-10 20:18:46 -07:00
Arjun Singh
ca8b299711 drop unread counts for now 2012-09-10 19:16:57 -07:00
Matthew Mongeau
6ee6e1c656 Disable posting anonymously for now. 2012-09-10 16:14:04 -07:00
Arjun Singh
7ad9b39b98 Merge master 2012-09-10 15:33:59 -07:00