Commit Graph

75 Commits

Author SHA1 Message Date
Chris Dodge
faf7c64ea5 add try/catch and fallback to returning a path to the root of the course 2013-02-07 10:32:13 -05:00
Chris Dodge
114d800c6a need to make path_to_location a dictionary since it needs to be keyed by the location 2013-02-06 15:17:47 -05:00
Chris Dodge
5a25d7fa6e Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/dangling-discussion-modules
Conflicts:
	lms/djangoapps/django_comment_client/utils.py
2013-02-06 14:05:56 -05:00
Chris Dodge
6ed2737c36 make LMS forum subsystem more robust in case of orphaned discussion modules. Given our draft/non-draft duality, we don't currently have a means to always do proper housekeeping at this point in time. However, we have to stop the LMS Forums from blowing up when encoutering one of these. 2013-02-06 13:32:50 -05:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Jay Zoldak
1f049410ae Add tests for django comment client utils 2013-01-29 14:34:02 -05:00
Victor Shnayder
ac8c59126d Add note about non-unique topic id across course runs bug 2013-01-24 15:12:53 -05:00
Chris Dodge
c6276c8394 only cache discussion forum info for 5 minutes before flushing. This is needed for Studio backed courses that can add new discussion items at any point in time. Also we need to also set metadata fields (which are basically the same as what gets passed in the XML) as the forums expect those values as metadata 2013-01-17 23:58:07 -05:00
Chris Dodge
d4f30b378e remove commented out line and add a new comment. also remove debugging trace output 2013-01-09 16:05:09 -05:00
Chris Dodge
e11706ef07 change over the 'get all discussion models' to use get_items() which is better supported in Mongo-backed stores 2013-01-09 15:53:22 -05:00
Chris Dodge
7229a9cdaf perform a new merge from master, resolve conflicts 2013-01-03 10:43:03 -05:00
Brian Wilson
8d0eb7f1a1 Respond to feedback (esp. use of .format()) 2012-11-26 15:43:18 -05:00
Brian Wilson
57cb8c1e21 Add unit tests 2012-11-20 15:56:18 -05: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
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
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
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
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
fff7bcc5a7 Remove more tags; anonymity to peers 2012-09-14 02:50:08 -07:00
Arjun Singh
e4c7a5ea97 Fix courseware context links; filter out unstarted topics. 2012-09-13 19:41:07 -07: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
8b7940f413 Fixed context links after searching for real, and removed some more dead code. 2012-09-11 03:40:33 -07:00
Ibrahim Awwal
fd6e30abfc Don't try to retrieve roles for anonymous posts. 2012-09-11 01:33:59 -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
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
Arjun Singh
0e1b247a7b courseware context links in discussion 2012-09-04 10:38:28 -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
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
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
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
Ibrahim Awwal
e58af44620 Annotate comment content wrappers with classes for the roles of the author. 2012-08-29 19:41:46 -07:00
Rocky Duan
fe74f9bc85 reconstruct after editing 2012-08-24 02:17:58 -07:00
Rocky Duan
80195176e9 use escape html everywhere and only send discussion data relavent 2012-08-24 01:45:55 -07:00
Rocky Duan
3761b02ce8 hide reply button after closing thread 2012-08-23 15:12:22 -07:00
Arjun Singh
d1a8cd3f65 Limiting depth of comments 2012-08-23 04:50:03 -07:00
Rocky Duan
0b00e3b099 make similar posts url working 2012-08-23 02:17:17 -07:00
Rocky Duan
43ef4f6482 fixed recent threads & tags links 2012-08-22 19:09:58 -07:00