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
6315fe3fe6
Allow sorting followed threads (works same as sorting anything else).
2012-09-18 14:50:38 -07:00
Ibrahim Awwal
53a1611eee
Change following=>followed.
2012-09-18 14:50:14 -07:00
Bridger Maxwell
b65577f2b7
Fixed tests for fast grading.
2012-09-18 13:18:19 -04:00
David Ormsbee
62bb10156d
Merge pull request #704 from MITx/feature/victor/custom-tabs
...
Custom tabs
2012-09-18 07:10:42 -07:00
Victor Shnayder
a242ac54b0
remove dead code
2012-09-18 10:10:07 -04:00
Calen Pennington
c914a46a3f
Merge pull request #691 from MITx/feature/victor/anon-deep-links
...
Feature/victor/anon deep links
2012-09-18 07:08:45 -07:00
Victor Shnayder
d9219c6086
Custom tabs
...
* specify in tabs list in course policy
- active page tracking now done in tabs.py
- properly handle the fact that there may be multiple textbooks
* Still need:
- wiki pages
- (if that's delayed, special-case syllabus support)
2012-09-18 08:45:09 -04: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
Arjun Singh
90f37b3344
Don't use the search API to retrieve all threads.
2012-09-17 14:10:58 -07:00
Bridger Maxwell
1e0932b734
Merge remote-tracking branch 'origin/master' into feature/bridger/course_grading
2012-09-16 00:39:43 -04:00
Bridger Maxwell
bdc9e55fd0
Fixed progress_summary to use get_display_items(), which respects access control.
2012-09-16 00:36:26 -04:00
David Ormsbee
b06aafd5ad
Merge pull request #697 from MITx/feature/arjun/run_specific_syllabi
...
Try and find a run-specific syllabus before loading a course-specific syllabus
2012-09-15 10:50:57 -07:00
Arjun Singh
08464725c3
Try and find a run-specific syllabus before loading a course-specific syllabus
2012-09-15 05:02:28 -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
Arjun Singh
46d830df13
Merge branch 'master' into feature/arjun/new-discussions
2012-09-14 15:15:21 -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
Victor Shnayder
a788db53e9
Show login modal if there's a next param to index, university index
...
* also replace the external-auth-related popping up of the signup form with jquery.
Presumably it takes care of the browser specific stuff.
2012-09-14 14:31:04 -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
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
154cb843dd
Bump up threads per page again, because I don't think showing 5 threads at a time is
...
particularly useful.
2012-09-14 02:48:49 -07:00
Ibrahim Awwal
2d58f8dea1
Fix load more pages button on single thread.
2012-09-14 02:37:46 -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
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
9197efc3a1
Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions
2012-09-13 21:59:09 -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
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
Victor Shnayder
f4a93b7c70
Merge remote-tracking branch 'origin/master' into feature/kfiedler/ocw-links
2012-09-13 10:22:44 -04:00
Victor Shnayder
66343884dc
pull ocw links from about/ocw_links.html
...
format should be
<ul>
<li>link</li>
<li>other link</li>
</ul>
2012-09-13 10:22:02 -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
Bridger Maxwell
5df381e728
Merge remote-tracking branch 'origin/master' into feature/bridger/course_grading
2012-09-11 13:37:54 -04: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
