Commit Graph

12296 Commits

Author SHA1 Message Date
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
ichuang
d643057052 count all types of modules, not just childless ones 2012-09-04 11:21:18 -04: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
ichuang
02d58a7ca2 display course load error messages on modulestore reload by instructor 2012-09-03 16:49:34 -04: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
ichuang
b0397ab0b5 fix to be compatible with jenkins test 2012-09-03 12:43:48 -04:00
ichuang
4e2ddd578a unit tests for instructor dashboard (grades CSV download) 2012-09-03 12:32:41 -04:00
ichuang
9b056b284d add tracking logging of instructor dashboard actions 2012-09-02 23:17:45 -04:00
ichuang
91dcef7fd0 add gitreload to instructor dashboard 2012-09-02 22:41:27 -04:00
ichuang
9e8ec09b4d pep8 fixes 2012-09-02 20:15:57 -04:00
ichuang
2efe481237 move instructor dashboard into its own lms djangoapp; add new
functionality - grade dump and download as csv, manage staff list,
force reload of course from xml
2012-09-02 19:05:34 -04:00
kimth
3de7c3a322 Merge branch 'master' into kimth/mark-graded 2012-09-01 08:05:29 -04: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
David Ormsbee
877ae91b7f Don't show View Courseware buttons if they don't have access to load the courseware 2012-08-31 21:50:33 -04:00
kimth
de9c981aea Merge branch 'master' into kimth/mark-graded 2012-08-31 21:25:53 -04:00
Arjun Singh
9eecd43a4a Fix jump to courseware test to expect a redirect 2012-08-31 17:49:15 -07:00
kimth
56cc237eef Merge branch 'master' into kimth/mark-graded 2012-08-31 20:41:39 -04: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
kimth
8c0780bcdc Adjust comments 2012-08-31 18:05:54 -04:00
kimth
e482a32d27 Accordion distinguishes items to be graded 2012-08-31 18:05:54 -04:00
David Ormsbee
69ea7aa873 Merge pull request #597 from MITx/feature/victor/nested-links
Feature/victor/nested links
2012-08-31 13:48:05 -07:00
David Ormsbee
04439a3217 add comments explaining prefetch need 2012-08-31 15:20:13 -04:00
David Ormsbee
29be6f8209 Prefetch user groups to speed up auth checks required to render Progress page view for students 2012-08-31 15:16:31 -04:00
Carlos Andrés Rocha
20e48e6615 Merge pull request #475 from MITx/tmac/openid-provider
OpenID provider implementation
2012-08-31 06:23:03 -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
32cb0897e9 Fixing sequentials nested inside of verticals, provides a path to sequentials nested in sequentials. Changes jump_to to redirect to courseware index. 2012-08-31 04:24:52 -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
Victor Shnayder
021ccde1b4 Make jump_to work with the xml modulestore
* it now works in the context of a specific course_id
* add tracking of parent locations to xml modulestore
* adjust lots of tests, including some refactoring
* NOT working yet: jumping to the right position in a sequence.
2012-08-30 18:47:11 -04:00
Victor Shnayder
22aa325d83 Enable linking into the middle of sequences
* add a url that has an extra /{position} at the end
* pass it through to get_module
2012-08-30 16:37:40 -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
Ibrahim Awwal
b13c5acd4f Save the user's selected sort order on the comments service.
Requires cs_comments_service to have the field default_sort_key on users.
2012-08-29 22:13:37 -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
ichuang
cb07b0601e missing "settings." in line in lms_migration 2012-08-29 22:04:39 -04:00
Carlos Andrés Rocha
902a887e79 [34078525] pep8 renaming of some extern_auth functions 2012-08-29 18:46:35 -04:00
Matthew Mongeau
13ae85ac35 Navigating threads. 2012-08-29 14:20:03 -04:00
Victor Shnayder
f5754f6d1e Add some rudimentary error checking to forum views
[Hopefully fix #34992235]
2012-08-29 13:30:55 -04:00
Matthew Mongeau
fb1368afa9 Move views and models out. 2012-08-29 11:43:09 -04:00
Matthew Mongeau
46d0d4c4f2 Hook up list to voting. 2012-08-29 11:19:29 -04:00
Matthew Mongeau
a5b1abb2a8 Remove log 2012-08-29 10:23:17 -04:00