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

2480 Commits

Author SHA1 Message Date
Ibrahim Awwal
d1e8f4c016 Properly puluralize comments tooltip and change "unread" to "new". 2012-09-20 04:53:02 -07:00
arjun810
2ccff10350 Merge pull request #738 from MITx/feature/arjun/unread_count 
Show total comments instead of unread only, and use a tooltip to show th...
 2012-09-20 04:31:19 -07:00
Tom Giannattasio
2b14468667 darker background for read posts 2012-09-20 07:27:33 -04:00
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
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
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
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
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
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
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
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
Ibrahim Awwal
daa38af58c Convert DiscussionFilter to coffeescript. 2012-09-17 18:55:52 -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
Ibrahim Awwal
5d4c60a880 Move new post button handler to DiscussionRouter. 2012-09-17 18:08:43 -07:00
Arjun Singh
aaa4db8d29 Fixes image uploades in firefox 2012-09-17 15:54:24 -07:00
Arjun Singh
90f37b3344 Don't use the search API to retrieve all threads. 2012-09-17 14:10:58 -07:00
Calen Pennington
0a55e1eae1 Add sub-environments for the lms that is running alongside the lms for debugging 2012-09-17 13:51:33 -04: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
Tom Giannattasio
d016c0b20a fixed discussion search cursor bug 2012-09-17 12:00:08 -04:00
Tom Giannattasio
2133ec9686 fixed word wrap issue on discussions 2012-09-17 11:55:37 -04:00
David Ormsbee
5fbbd0ddbd Merge pull request #646 from MITx/feature/dave/disable_query_count 
Move QueryCountDebugMiddleware inclusion to dev.py instead of common.py ...
 2012-09-17 06:42:32 -07: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
2ee41ebf0c blockquotes may be fixed 2012-09-15 03:10:51 -07:00
Arjun Singh
3b13013ecc Merge whitespace fix 2012-09-15 02:14:01 -07:00