arjun810
53f524edfd
Merge pull request #737 from MITx/feature/tomg/discussion-read
...
darker background for read posts
2012-09-20 04:29:45 -07:00
Tom Giannattasio
2b14468667
darker background for read posts
2012-09-20 07:27:33 -04:00
Ibrahim Awwal
d6cff4d563
Merge pull request #735 from MITx/feature/arjun/unread_count
...
Unread counts + tracking for discussion
2012-09-20 03:49:10 -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
Ibrahim Awwal
5032a1a1d5
Merge pull request #734 from MITx/feature/arjun/prepare_lms_discussion_2
...
Change unread to read; makes some things clearer both on the comment service and in the django client
2012-09-20 00:28:27 -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
Victor Shnayder
084a91e325
Merge pull request #730 from MITx/hotfix/rocha/tonys-doc-update
...
Update doc/xml-format.md
2012-09-19 19:17:53 -07:00
Carlos Andrés Rocha
32d224c4d0
Update doc/xml-format.md
2012-09-19 18:10:13 -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
dcd32abc0e
Merge pull request #729 from MITx/feature/dave/textbook_fixes
...
Fixing textbook bugs that didn't appear in 6.002x
2012-09-19 14:58:24 -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
kimth
b3bde7d631
Merge pull request #727 from MITx/feature/tomg/multiple-choice
...
fixed styles for checkboxes
2012-09-19 11:05:54 -07:00
Tom Giannattasio
82ab2e5a67
fixed styles for checkboxes
2012-09-19 14:03:56 -04:00
kimth
3428f5f45a
Merge pull request #726 from MITx/feature/tomg/multiple-choice
...
polished multiple choice question styles
2012-09-19 08:48:19 -07:00
David Ormsbee
10a838cb01
remove hardcoding of 6.002x in textbook page
2012-09-19 11:13:47 -04:00
Tom Giannattasio
2c4b335f98
polished multiple choice question styles
2012-09-19 11:02:45 -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
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
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
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
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
