Tom Giannattasio
2c4b335f98
polished multiple choice question styles
2012-09-19 11:02:45 -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
73d114d057
Merge pull request #724 from MITx/feature/dev/grade_download_fixes
...
Fix CSV downloads when there are non-ASCII chars in student data, and pr...
2012-09-18 17:41:31 -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
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
arjun810
501d44d023
Merge pull request #722 from MITx/kimth/fix-imageresponse
...
Don't break on empty answer string
2012-09-18 13:43:18 -07:00
kimth
d401a32709
Don't break on empty answer string
2012-09-18 16:39:58 -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
d7dffb034b
Merge pull request #721 from MITx/feature/cale/cms-remove-wips
...
Feature/cale/cms remove wips
2012-09-18 12:44:08 -07: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
Calen Pennington
da4206f170
Remove scratch pad ui WIPs, until we decide we actually want it
2012-09-18 15:31:32 -04:00
Calen Pennington
1e54023d36
Don't make bottom save & update button as wip
2012-09-18 15:28:43 -04:00
Victor Shnayder
b84966da62
Merge pull request #720 from MITx/feature/cale/cms-display-names
...
Use display names for module edit links in the cms
2012-09-18 12:27:36 -07:00
Calen Pennington
07d4f43f80
Use display names for module edit links in the cms
2012-09-18 15:26:37 -04:00
David Ormsbee
12586f3679
Merge pull request #718 from MITx/feature/cale/cms-drag-and-drop-children
...
Feature/cale/cms drag and drop children
2012-09-18 12:09:31 -07:00
Calen Pennington
d7cbd1c814
Don't do extra json conversion/de-conversion for data/children going to the cms
2012-09-18 15:07:35 -04:00
Victor Shnayder
09909c7ec2
Merge pull request #711 from MITx/kimth/onreset-type
...
onreset rerandomize option
2012-09-18 11:09:25 -07:00
Tom Giannattasio
b90c37df41
added styles for blockquotes and lists within responses and comments
2012-09-18 14:02:52 -04:00
Victor Shnayder
892cf7bace
cleanup tabs documentation a bit
2012-09-18 13:46:57 -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
bb06a926bb
Make saving also save the children in the #sortable element (TODO: name the #sortable element better)
2012-09-18 13:19:30 -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
Calen Pennington
0492c8e3bd
Enable wip flag
2012-09-18 13:17:52 -04:00
Calen Pennington
0758d21d6a
Re-enable wip markers in cms css
2012-09-18 10:44:12 -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
arjun810
0df2000680
Merge pull request #715 from MITx/feature/ibrahim/discussion-cleanup
...
Feature/ibrahim/discussion cleanup
2012-09-18 03:18:50 -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
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
