Ibrahim Awwal
e7e0c2c141
Merge pull request #748 from MITx/hotfix/arjun/discussion_trailing_slash
...
New URLs require a trailing slash
2012-09-21 05:22:32 -07:00
Arjun Singh
663e38aa1f
New URLs require a trailing slash
2012-09-21 05:19:23 -07:00
Calen Pennington
b799d9b73f
Merge pull request #744 from MITx/bug/tomg/collapsible-hint
...
Bug/tomg/collapsible hint
2012-09-21 05:13:01 -07:00
Ibrahim Awwal
57d5ba07c0
Remove commented out block and pull some stuff into a function to load the first page of results for a thread query.
2012-09-21 04:33:16 -07:00
Ibrahim Awwal
91de5633b5
DjDT redirect intercept is annoying, especially for tests, so disable it
2012-09-21 00:15:12 -07:00
Ibrahim Awwal
939b927fbd
Merge branch 'master' into feature/ibrahim/followed-threads
...
Conflicts:
lms/djangoapps/django_comment_client/forum/views.py
2012-09-20 23:55:13 -07:00
Ibrahim Awwal
7727e9f2a2
Match custom static tabs after discussion URLs so that discussion can actually work.
2012-09-20 19:22:25 -07:00
Tom Giannattasio
4af134b28a
fixed large collapsible text and triple toggle
2012-09-20 17:49:36 -04:00
Bridger Maxwell
68ab19730f
Merge remote-tracking branch 'origin/master' into feature/bridger/course_grading
...
Conflicts:
lms/djangoapps/courseware/views.py
2012-09-20 17:42:31 -04:00
Bridger Maxwell
997c0ee1c6
Grading test now tries a weighted problem.
2012-09-20 17:38:07 -04:00
Victor Shnayder
26a63850b3
Merge pull request #733 from MITx/feature/victor/static-tabs
...
Feature/victor/static tabs
2012-09-20 14:37:35 -07:00
Bridger Maxwell
92171ea5da
Added course grading test.
2012-09-20 16:56:27 -04:00
Bridger Maxwell
9ec38176e0
Small cleanup tweaks in grading.
2012-09-20 16:56:09 -04:00
Tom Giannattasio
99a009abdf
tweaked sound lab styles
2012-09-20 15:54:09 -04:00
ichuang
b9af428b40
formula.py handle imaginary correctly; symmath_check add numerical option
2012-09-20 14:37:21 -04:00
Victor Shnayder
621acd20e3
broken tabs are important enough to count as an error, not a warning
2012-09-20 10:52:40 -04:00
Victor Shnayder
a19319f7fb
add some error handling
2012-09-20 10:36:22 -04:00
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
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
