Commit Graph

451 Commits

Author SHA1 Message Date
Calen Pennington
ce3638538c Make inline editing save to mongo and then update the preview 2012-10-01 15:17:41 -04:00
Calen Pennington
44805ca383 Make discussion js work for cms as well as lms so that inline discussion xmodules load 2012-10-01 15:16:54 -04:00
Arjun Singh
8fb6204073 Better fix for trailing slash 2012-09-21 05:42:51 -07:00
Arjun Singh
663e38aa1f New URLs require a trailing slash 2012-09-21 05:19:23 -07:00
Ibrahim Awwal
57d5ba07c0 Remove commented out block and pull some stuff into a function to load the first page of results for a thread query. 2012-09-21 04:33:16 -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
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
Ibrahim Awwal
e809fb3b64 Use loadMorePages to load All as well. 2012-09-19 07:02:24 -07:00
Rocky Duan
f6efa99f6c unread count tracking 2012-09-19 06:15:48 -07:00
Ibrahim Awwal
74ba9319e3 Fix clicking on commentables in the dropdown. 2012-09-18 16:30:37 -07:00
Ibrahim Awwal
0966e8bdef Keep thread sorting order stable when sorting by comments or votes by using
created_at time as a tiebreaker. This is a stopgap though; the service should handle
this. But it looks silly with things shuffling around right now.
2012-09-18 15:06:05 -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
Ibrahim Awwal
7fb757c86c Rename Tooltips => TooltipManager. 2012-09-17 23:03:36 -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
daa38af58c Convert DiscussionFilter to coffeescript. 2012-09-17 18:55:52 -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
Ibrahim Awwal
5d4c60a880 Move new post button handler to DiscussionRouter. 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
2ee41ebf0c blockquotes may be fixed 2012-09-15 03:10:51 -07:00
Arjun Singh
7c86f324ea Fixes the one broken thread in prod; it had no lettters in its ID, so the id was being cast to a number. 2012-09-14 22:55:45 -07:00
Arjun Singh
b5351cc584 Support legacy anonymity 2012-09-14 21:59:09 -07:00
Arjun Singh
6d753ae323 Ensure that ability is present when showing endorse button 2012-09-14 17:41:02 -07:00
Rocky Duan
9c19f64c01 for students, only display endorse icon if endorsed 2012-09-14 17:22:11 -07:00
Arjun Singh
b2c88575ee fix deep comment links 2012-09-14 15:38:48 -07:00
Arjun Singh
8631cb2644 Add a tiny bit of padding back to unexpanded form 2012-09-14 13:39:07 -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
Tom Giannattasio
2f5ad06eec smoother comment form expansion 2012-09-14 16:34:55 -04:00
Arjun Singh
3756d31761 Placeholder for wmd editors; specifically comment form 2012-09-14 13:20:54 -07: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
11289e6d90 comment styling 2012-09-14 12:59:10 -07:00
Arjun Singh
387c8ea1b5 make wmd editor for comments 2012-09-14 12:46:48 -07:00
Carlos Andrés Rocha
c72dafa906 Fix error when selecting all boards on the discussion pane 2012-09-14 13:45:01 -04:00
Tom Giannattasio
b98b43e8b9 sidebar height one pixel taller 2012-09-14 11:41:48 -04:00
Arjun Singh
7dbea50d79 reasonable behavior when creating a thread 2012-09-14 05:52:49 -07:00
Ibrahim Awwal
a570b6030a Prevent threads from being added to a discussion twice.
Probably slow, but it works for now.
2012-09-14 03:40:41 -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
6057904d51 Fix sidebar height growing forever when loading more pages, and also jumping to top when loading more pages. 2012-09-14 02:40:15 -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
ac9dd7bd1e Fix hiding the more pages button. 2012-09-14 02:23:39 -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
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
Ibrahim Awwal
d92a070ab1 Obey current search query and sort order when retrieving additional pages. 2012-09-13 18:34:01 -07:00