Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

7051 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
55a9da933a DRY things slightly 2012-09-20 02:15:51 -07:00
Arjun Singh
3567e23a9d Unneeded imports 2012-09-20 02:13:35 -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
Arjun Singh
93d5a6690e Change unread to read; makes some things clearer both on the comment service and in the django client 2012-09-20 00:25:43 -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
Bridger Maxwell
21f8fc3f9c Fixed small bug. 2012-09-20 02:17:51 -04:00
Bridger Maxwell
b62e13aec8 Using new xmodule API in grades.py. 2012-09-20 02:06:41 -04:00
Victor Shnayder
27cd9c9f82 Remove unused 'module' parameter from replace_{static,course}_urls 2012-09-20 01:12:33 -04:00
Victor Shnayder
4a162dadae bugfixes for static tabs 
- move courseware wiki views above catch-all rule
- handle courses with no custom tabs
 2012-09-20 01:11:59 -04:00
Bridger Maxwell
234fb813c6 Changed grades.grade to use new xmodule API. Now properly explores descriptor tree. 2012-09-20 01:03:43 -04:00
Victor Shnayder
7a88223ef7 custom tabs 
* still needs better error checking and testing
 2012-09-20 00:51:23 -04:00
ichuang
f1e5d6976e fix tabs fallback check when no tabs specified 2012-09-19 20:49:36 -04:00
ichuang
672ede14d1 improvements in symbolic math checking - more standard functions, 
use new capa_alert div for error messages, clean up debugging
 2012-09-19 20:37:26 -04:00
David Ormsbee
40b5e54dc5 Merge pull request #725 from MITx/feature/arjun/prepare_lms_for_unread_counts 
Prepare lms for upcoming discussion service changes.
 2012-09-19 15:00:20 -07: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
Ibrahim Awwal
e809fb3b64 Use loadMorePages to load All as well. 2012-09-19 07:02:24 -07:00
Arjun Singh
c83a27ec02 Merge with lms pre-update fix 2012-09-19 06:17:19 -07:00
Rocky Duan
f6efa99f6c unread count tracking 2012-09-19 06:15:48 -07:00
Arjun Singh
eab1737e83 Prepare lms for upcoming discussion service changes. 2012-09-19 05:57:30 -07:00
Bridger Maxwell
142624a6ca Added select_related to gradebook. Slight performance boost. 2012-09-19 00:20:46 -04:00
David Ormsbee
97c880a714 Fix CSV downloads when there are non-ASCII chars in student data, and prefetch groups info to speed up the grades page 2012-09-18 20:39:42 -04:00
Ibrahim Awwal
74ba9319e3 Fix clicking on commentables in the dropdown. 2012-09-18 16:30:37 -07:00
arjun810
c74d5c88be Merge pull request #723 from MITx/feature/dave/fix_no_topic_forum 
Make the default topic a dict so it doesn't error on courses that don't ...
 2012-09-18 16:20:21 -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
0966e8bdef Keep thread sorting order stable when sorting by comments or votes by using 
created_at time as a tiebreaker. This is a stopgap though; the service should handle
this. But it looks silly with things shuffling around right now.
 2012-09-18 15:06:05 -07: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
Calen Pennington
a3a2181a21 Merge pull request #719 from MITx/feature/tomg/discussion-sidebar 
show full sidebar title; blockquote and list styles for comments
 2012-09-18 13:22:21 -07:00
Tom Giannattasio
3af4ce887f removed extraneous comments 2012-09-18 16:01:31 -04:00
Calen Pennington
84f1c1fc1c Merge pull request #717 from MITx/feature/bridger/wiki_fixes 
Disabled pipeline wrapper for compressed CSS.
 2012-09-18 12:43:00 -07:00
Tom Giannattasio
b90c37df41 added styles for blockquotes and lists within responses and comments 2012-09-18 14:02:52 -04:00
Tom Giannattasio
ac7562ccbf added padding to vote button so titles don't hit it 2012-09-18 13:46:25 -04:00
Tom Giannattasio
feb78e1549 changed sidebar to display full post title 2012-09-18 13:30:30 -04:00
Bridger Maxwell
5ef6a42c8f Disabled pipeline wrapper for compressed CSS. It now works more like dev environment. 2012-09-18 13:28:54 -04:00
Calen Pennington
c1ce5a87ac Move sequence nav into xmodule 2012-09-18 13:19:01 -04: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
ba92bdc2dc Merge pull request #708 from MITx/feature/cale/cms-bug-fixes 
Feature/cale/cms bug fixes
 2012-09-18 06:20:15 -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
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
7fb757c86c Rename Tooltips => TooltipManager. 2012-09-17 23:03:36 -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