Commit Graph

1676 Commits

Author SHA1 Message Date
Ibrahim Awwal
afdd11342e Show total comments instead of unread only, and use a tooltip to show the unread count. 2012-09-20 04:26:58 -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
Arjun Singh
6824ab6305 Merge branch 'master' into feature/arjun/unread_count 2012-09-20 00:34:30 -07:00
Victor Shnayder
7a88223ef7 custom tabs
* still needs better error checking and testing
2012-09-20 00:51:23 -04:00
David Ormsbee
3cde783bdf Display the last top level element in the Table of Contents as expandable.
This isn't a great fix, but I'm confused what's going on. It's something
in JQuery.TreeView. We write out the HTML correctly, but the lastExpandable
style causes the list item to not be expandable. This didn't bite us in
6.002x because the last item was an appendix that isn't expandable anyway.
It does affect 6.00x, where the last item is Chapter 5 at the moment.
2012-09-19 17:37:15 -04:00
David Ormsbee
f9a49ece6f Dynamically find the start and end pages of a textbook instead of hardcoding to 6.002 values 2012-09-19 17:12:08 -04:00
David Ormsbee
10a838cb01 remove hardcoding of 6.002x in textbook page 2012-09-19 11:13:47 -04:00
Rocky Duan
f6efa99f6c unread count tracking 2012-09-19 06:15:48 -07:00
David Ormsbee
62bb10156d Merge pull request #704 from MITx/feature/victor/custom-tabs
Custom tabs
2012-09-18 07:10:42 -07: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
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
151dbda242 Fix followed state not showing up on initial forum load in sidebar. 2012-09-18 04:09:38 -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
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
Arjun Singh
90f37b3344 Don't use the search API to retrieve all threads. 2012-09-17 14:10:58 -07:00
Tom Giannattasio
092403c1bc Merge pull request #688 from MITx/feature/kfiedler/submission-feedback
Style for submission feedback on problems
2012-09-17 10:21:04 -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
adc95ba14c Minor change on progress page. Hiding (0/0) on sections that don't have any score. 2012-09-16 00:36:55 -04:00
Arjun Singh
3b13013ecc Merge whitespace fix 2012-09-15 02:14:01 -07:00
Arjun Singh
4efe1135cb fix up whitespace causing weirdness in inline response comment rendering 2012-09-15 02:12:52 -07:00
Ibrahim Awwal
c47f0ffb47 Hopefully fix code formatting showing up on comments? But it doesn't seem to happen everywhere... 2012-09-15 00:42:47 -07:00
Arjun Singh
b5351cc584 Support legacy anonymity 2012-09-14 21:59:09 -07:00
Rocky Duan
3e241182c7 Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions 2012-09-14 17:22:26 -07:00
Rocky Duan
9c19f64c01 for students, only display endorse icon if endorsed 2012-09-14 17:22:11 -07:00
Ibrahim Awwal
17c3dd913e Tooltips on follow and vote. 2012-09-14 16:55:16 -07:00
Arjun Singh
b2c88575ee fix deep comment links 2012-09-14 15:38:48 -07:00
Arjun Singh
46d830df13 Merge branch 'master' into feature/arjun/new-discussions 2012-09-14 15:15:21 -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
Arjun Singh
3756d31761 Placeholder for wmd editors; specifically comment form 2012-09-14 13:20:54 -07:00
Tom Giannattasio
7b7ad3d8c2 new paragraph styles for comments 2012-09-14 16:07:45 -04: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
387c8ea1b5 make wmd editor for comments 2012-09-14 12:46:48 -07: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
Victor Shnayder
6472e0ebe3 If there's a ?next param, redirect there instead of dashboard after login 2012-09-14 14:29:31 -04:00
David Ormsbee
820003b96c Prevent showing redundant roles for this user 2012-09-14 14:29:17 -04:00
Tom Giannattasio
19c5895cbe tweaked profile posted details template 2012-09-14 11:30:51 -04:00
David Ormsbee
2e34c4ae5c Merge pull request #676 from MITx/feature/kfiedler/ocw-links
Feature/kfiedler/ocw links
2012-09-14 07:26:53 -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
2d58f8dea1 Fix load more pages button on single thread. 2012-09-14 02:37:46 -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
Arjun Singh
e4c7a5ea97 Fix courseware context links; filter out unstarted topics. 2012-09-13 19:41:07 -07:00
Kyle Fiedler
03ad061a2f style for submission feedback 2012-09-13 20:10:45 -04:00
Carlos Andrés Rocha
5ce16738fb Reverting to original video player 2012-09-13 18:38:48 -04:00