Commit Graph

448 Commits

Author SHA1 Message Date
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
Ibrahim Awwal
8b7940f413 Fixed context links after searching for real, and removed some more dead code. 2012-09-11 03:40:33 -07:00
Ibrahim Awwal
8f776ab2d8 Comment out some things which I am 99.9% sure are vestigial, which cuts
down on the amount of data shuffled around and saves some rendering time
on the forum index as well.
2012-09-11 02:02:15 -07:00
Ibrahim Awwal
9266ade9b6 Removed helpers.show_if.
I don't know why this was ever defined when python has a ternary operator
which doesn't require its arguments to be evaluated if the condition
evaluates to false, whereas this helper method does.
2012-09-11 01:49:43 -07:00
Ibrahim Awwal
fd6e30abfc Don't try to retrieve roles 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
e3ef9993a0 Fix context for posts that don't have it. 2012-09-10 20:35:06 -07:00
Ibrahim Awwal
12dbdfa0f8 Removed some dead code and marked a method that I think is dead.
Related templates should probably also be deleted. I did this mainly
because it's confusing to have so many functions with similar names and
there's a lot of unused stuff from discussion v1.
2012-09-10 20:07:41 -07:00
Ibrahim Awwal
a8beb2a807 Add context link to threads rendered via AJAX. 2012-09-10 19:48:11 -07:00
Arjun Singh
7ad9b39b98 Merge master 2012-09-10 15:33:59 -07:00
David Ormsbee
db0549be78 Merge pull request #594 from MITx/feature/ibrahim/discussion_distinguish_instructors
Feature/ibrahim/discussion distinguish instructors
2012-09-07 06:52:15 -07:00
David Ormsbee
b276d8b4b1 Changes as per cpennington's code review 2012-09-07 09:47:13 -04:00
Ibrahim Awwal
b2f3eee93b Pagination in inline discussion views. 2012-09-07 03:37:19 -07:00
Ibrahim Awwal
c3e3fee963 Convert expand/collapse into buttons and change default sort order to date. Buttons should be styled better but I don't know how to do it. 2012-09-06 23:37:43 -07:00
Ibrahim Awwal
00a6526fd0 Make voting render properly in inline discussions. Also might have fixed
following if it wasn't working before.
2012-09-05 17:58:18 -07:00
Calen Pennington
4d2983cb99 Merge pull request #587 from MITx/feature/victor/forum-anon-user-500
Add some rudimentary error checking to forum views
2012-09-05 06:21:46 -07:00
David Ormsbee
319e6260d0 Upped the number of threads per discussion page to 8, per Tony's request. 2012-09-04 21:11:34 -04:00
Arjun Singh
0e1b247a7b courseware context links in discussion 2012-09-04 10:38:28 -07:00
Arjun Singh
91aec6d38f Including courseware context in threads for non inline discussion 2012-09-04 09:55:18 -07:00
Arjun Singh
ebae40a392 fix search 2012-09-04 09:21:21 -07:00
Rocky Duan
b2821c5354 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-04 01:54:59 -07:00
Rocky Duan
d39e3de51b fit permission into new discussion view structure; admin actions not working yet 2012-09-04 01:54:39 -07:00
Ibrahim Awwal
e8ac5860e1 Oops, this was needed for replies to be rendered in the main forum view. 2012-09-04 01:28:36 -07:00
Ibrahim Awwal
32ccf51e97 Embedded discussions displayed with the new style but without replying yet.
Needs different CSS to make it more appropriate in the embedded view.
2012-09-04 01:14:18 -07:00
Arjun Singh
629a8e7ed5 allowing for 0 top level topics 2012-09-03 23:04:30 -07:00
Arjun Singh
098b90ebac Top level discussions 2012-09-03 23:02:14 -07:00
David Ormsbee
bce4e0f1bc Merge pull request #595 from MITx/feature/ibrahim/discussion_sort_preferences
Feature/ibrahim/discussion sort preferences
2012-09-03 10:25:04 -07:00
Ibrahim Awwal
f6ca91a504 Refactor some things more and make the forum index sort of work, although the sticky sidebar is broken, probably because there's no content in the thread view pane. 2012-08-31 23:43:13 -07:00
Ibrahim Awwal
e600004b1f Make the comment client not explode if it doesn't get a sort preference from the comment service. 2012-08-31 15:19:17 -07:00
Arjun Singh
26ca1f5f5b Merge master 2012-08-31 15:13:50 -07:00
Arjun Singh
3a9542ebb1 Move function; stop shadowing map; add todo about caching for _DISCUSSIONINFO 2012-08-31 15:11:29 -07:00
Arjun Singh
3f58e1dd01 Remove context from inline posts 2012-08-31 05:08:00 -07:00
Arjun Singh
7108985325 Adding context to posts in the forum view. 2012-08-31 04:59:12 -07:00
Arjun Singh
795c116389 populate dropdown 2012-08-31 03:27:02 -07:00
Victor Shnayder
d815d50aee Remove obsolete eager flag for xml modulestore
* has to be eager
2012-08-30 19:26:50 -04:00
Matthew Mongeau
6ee27d02e4 Searching and fixes. 2012-08-30 15:55:46 -04:00
Ibrahim Awwal
b80ceecf87 Note when posts have been updated, and put the creation date in the title text. 2012-08-30 00:19:42 -07:00