Commit Graph

5484 Commits

Author SHA1 Message Date
David Ormsbee
41b5e5b81f Merge pull request #619 from MITx/feature/arjun/generalize_show
Make show answer work for choiceresponse + javascriptinputs
2012-09-04 07:49:02 -07:00
Arjun Singh
93ed042786 Make show answer work for choicegroups + javascriptinputs 2012-09-03 19:37:48 -07:00
David Ormsbee
999343d641 Merge pull request #618 from MITx/feature/victor/hide-progress-tab
Feature/victor/hide progress tab
2012-09-03 11:40:35 -07:00
Victor Shnayder
f926925ca6 Add a hide_progress_tab course policy flag
- for internal cs50 until we have grade integration set up (only really needed for external version)
2012-09-03 14:12:43 -04:00
Victor Shnayder
79109a6244 Apply attr_map translation to metadata loaded from policy file as well as from xml. 2012-09-03 13:51:20 -04:00
David Ormsbee
bce4e0f1bc Merge pull request #595 from MITx/feature/ibrahim/discussion_sort_preferences
Feature/ibrahim/discussion sort preferences
2012-09-03 10:25:04 -07:00
kimth
c26126d8d6 Merge pull request #617 from MITx/feature/kfiedler/detailed-answer
Added styles for detailed solution
2012-09-03 08:14:03 -07:00
David Ormsbee
df85ac5762 Merge pull request #616 from MITx/feature/dave/external_forum
Add support for external forum link. Reviewed by Victor.
2012-09-03 07:54:38 -07:00
David Ormsbee
ea78559ad3 Changed FIXME -> TODO in response to comments 2012-09-03 10:47:15 -04:00
Kyle Fiedler
e50f622915 Added styles for detailed solution 2012-09-03 10:40:38 -04:00
David Ormsbee
7f121a3b7c Merge pull request #611 from MITx/kimth/mark-graded
Tweaks to the LMS from 6.002x preparation
2012-09-03 07:38:50 -07:00
David Ormsbee
f0ef50ef7c Merge pull request #613 from MITx/feature/ichuang/add-gitreload-docs
add docs for gitreload
2012-09-03 07:33:59 -07:00
David Ormsbee
5194dc3177 Add support for discussion_link attribute in course policy files as a kludge to support CS50's external forums 2012-09-02 22:22:01 -04:00
David Ormsbee
1a1c5edab4 Completely cosmetic fix to make the indentation clearer. 2012-09-02 16:56:17 -04:00
ichuang
9433e89710 add docs for gitreload 2012-09-01 10:16:38 -04:00
kimth
ea4019c0a0 Add comment to sequence/display.coffee 2012-09-01 09:01:19 -04:00
kimth
90bcb00e58 Allow ckt editor to be embedded in sequence 2012-09-01 08:56:16 -04:00
kimth
6f03ebb198 Add message for student in CustomResponse error 2012-09-01 08:26:54 -04:00
kimth
3de7c3a322 Merge branch 'master' into kimth/mark-graded 2012-09-01 08:05:29 -04:00
arjun810
3f07e5fdb1 Merge pull request #612 from MITx/feature/view_courseware_buttons
Don't show View Courseware buttons if they don't have access to load it
2012-08-31 18:57:37 -07:00
David Ormsbee
877ae91b7f Don't show View Courseware buttons if they don't have access to load the courseware 2012-08-31 21:50:33 -04:00
kimth
de9c981aea Merge branch 'master' into kimth/mark-graded 2012-08-31 21:25:53 -04:00
David Ormsbee
059fc5e89e Merge pull request #610 from MITx/feature/arjun/fix_jump_test
Fix jump to courseware test to expect a redirect
2012-08-31 17:51:50 -07:00
Arjun Singh
9eecd43a4a Fix jump to courseware test to expect a redirect 2012-08-31 17:49:15 -07:00
kimth
ae022b662a Merge branch 'kimth/mark-graded' of https://github.com/MITx/mitx into kimth/mark-graded 2012-08-31 20:46:34 -04:00
kimth
4800aca5c9 Merge pull request #609 from MITx/features/kfiedler/mark-graded
Features/kfiedler/mark graded
2012-08-31 17:46:07 -07:00
kimth
56cc237eef Merge branch 'master' into kimth/mark-graded 2012-08-31 20:41:39 -04:00
David Ormsbee
b5b93cad30 Merge pull request #599 from MITx/feature/arjun/add_discussion_context
Add context about which bit of courseware a post is about
2012-08-31 17:22:07 -07:00
Ibrahim Awwal
e600004b1f Make the comment client not explode if it doesn't get a sort preference from the comment service. 2012-08-31 15:19:17 -07:00
Arjun Singh
26ca1f5f5b Merge master 2012-08-31 15:13:50 -07:00
Arjun Singh
3a9542ebb1 Move function; stop shadowing map; add todo about caching for _DISCUSSIONINFO 2012-08-31 15:11:29 -07:00
kimth
05015a1375 Merge branch 'kimth/mark-graded' of https://github.com/MITx/mitx into kimth/mark-graded 2012-08-31 18:06:30 -04:00
kimth
8c0780bcdc Adjust comments 2012-08-31 18:05:54 -04:00
kimth
e482a32d27 Accordion distinguishes items to be graded 2012-08-31 18:05:54 -04:00
kimth
01f875a124 Merge branch 'master' into kimth/mark-graded 2012-08-31 18:02:37 -04:00
Kyle Fiedler
e7a7c71324 Added icon to mark it as having a due date 2012-08-31 17:58:08 -04:00
kimth
648d54b027 Adjust comments 2012-08-31 17:05:48 -04:00
kimth
e8c4bc0c25 Accordion distinguishes items to be graded 2012-08-31 17:05:48 -04:00
Tom Giannattasio
881404bab7 Merge pull request #602 from MITx/bug/kfiedler/sequence-nav
Added fix for the sequnce nave hovers
2012-08-31 14:01:26 -07:00
Kyle Fiedler
60ea621560 Remove problem-answer class that will now not be used 2012-08-31 16:55:50 -04:00
David Ormsbee
69ea7aa873 Merge pull request #597 from MITx/feature/victor/nested-links
Feature/victor/nested links
2012-08-31 13:48:05 -07:00
kimth
10a80ddfbd Merge pull request #606 from MITx/feature/kfiedler/problem-group
Added class problem-and-answer with margin on the bottom
2012-08-31 13:26:54 -07:00
Tom Giannattasio
3889388abf Merge pull request #596 from MITx/features/kfiedler/multicourse-buttons
Make the two buttons that lead to the courseware more actionable
2012-08-31 13:19:03 -07:00
Kyle Fiedler
f2fc51bd35 Added class problem-and-answer with margin on the bottom 2012-08-31 16:08:41 -04:00
Calen Pennington
5fdf795dd9 Merge pull request #605 from MITx/feature/prefetch_user_groups
Reduce # of queries for auth checks on Progress page by prefetching user groups
2012-08-31 13:06:49 -07:00
Kyle Fiedler
3edf1a6a84 Added buttons for both pages to make it even more clear to start class 2012-08-31 15:58:44 -04:00
Kyle Fiedler
7c1cc4ed21 Added hover on course about and more actionable text 2012-08-31 15:58:44 -04:00
Kyle Fiedler
0ff70472c9 Added styles for dashboard to have link around whole class 2012-08-31 15:58:44 -04:00
David Ormsbee
04439a3217 add comments explaining prefetch need 2012-08-31 15:20:13 -04:00
David Ormsbee
29be6f8209 Prefetch user groups to speed up auth checks required to render Progress page view for students 2012-08-31 15:16:31 -04:00