Commit Graph

2934 Commits

Author SHA1 Message Date
Will Daly
5e433cda2e Clarified comments about the logic of showing the save button 2013-03-14 14:43:04 -04:00
Will Daly
4dabb4ceb6 Save button no longer appears for non-randomized problems unlimited attempts 2013-03-14 14:34:36 -04:00
John Hess
0b2226b051 Merge pull request #1660 from MITx/hotfix/jkarni/folditorder
Table order fix (again), changes a single character
2013-03-12 16:17:08 -07:00
Vik Paruchuri
c40ab310c3 Blank line fixes 2013-03-12 14:24:42 -04:00
Vik Paruchuri
554cb752fa Pep8 cleanup 2013-03-12 12:20:11 -04:00
Julian Arni
1058b552f2 Table order fix (again) 2013-03-12 11:30:14 -04:00
John Hess
331806f155 Merge pull request #1646 from MITx/feature/jkarni/folditx
Feature/jkarni/folditx
2013-03-11 15:50:05 -07:00
John Hess
ad92eb4d02 whitespace back to original. for real though. 2013-03-11 18:05:34 -04:00
John Hess
00c35c95a4 whitespace back to original 2013-03-11 18:05:10 -04:00
John Hess
cc2c26b924 reverted change to definition to/from xml 2013-03-11 18:04:21 -04:00
Jay Zoldak
1c98d5fc8d Fix modulestore tests for pep8 violations 2013-03-11 15:16:09 -04:00
David Ormsbee
0605c94113 Merge pull request #1636 from MITx/feature/brian/htmlbook
Initial implementation of htmlbook.
2013-03-11 11:38:46 -07:00
Brian Wilson
53f85f2a07 return empty list if no html or pdf textbook appears in policy.json 2013-03-11 13:52:43 -04:00
David Ormsbee
aceb666076 Merge pull request #1642 from MITx/fix/rocha/numericresponse-exponential
Make numeric response handle plus sign exponential correctly
2013-03-11 10:03:44 -07:00
Carlos Andrés Rocha
5f95c6848c Make numeric response handle plus sign exponential correctly
NumericResponse was failing to accept as correct an answer with a plus
sign in the exponential. For example: 5.0e+1 was marked as incorrect
if the answer was 50. However, 5.0e1 was marked as correct. This
caused confusion, since the answer shown to students included the plus
sign.

LMS Lighthouse [#242]
2013-03-11 12:53:01 -04:00
Julian Arni
588b27c9dc Added Descriptor method, fixed order issue. 2013-03-11 11:17:12 -04:00
Diana Huang
421e169e1e Update tests with new attributes. 2013-03-11 10:29:18 -04:00
Diana Huang
0c949d20c9 Add the ability to hide correctness markers
with a custom message for when they submit something.
2013-03-11 10:12:33 -04:00
Carlos Andrés Rocha
fb407e3cb8 Merge pull request #1633 from MITx/fix/will/choicegroup_html_render_error
Fixed undefined variable error in choicegroup.html
2013-03-08 14:30:59 -08:00
Calen Pennington
8bb0c64ff9 Set grading policy to an empty dict if it can't be decoded from json 2013-03-08 15:36:19 -05:00
Will Daly
607f27e715 Fixed undefined variable error in choicegroup.html 2013-03-08 14:06:45 -05:00
Will Daly
352126b417 Updated tests for correct_map to match changes made to get_npoints 2013-03-08 10:08:20 -05:00
David Ormsbee
5f44b2de04 minor comment on partial credit 2013-03-07 23:52:01 -05:00
David Ormsbee
30f3923c15 Quick patch to regression causing partial credit to break on 6.00x 2013-03-07 23:50:09 -05:00
Diana Huang
2c6ee50ac3 Fix issue where javascript was disappearing from problem html 2013-03-07 19:39:43 -05:00
Victor Shnayder
b02ff247cb Merge pull request #1623 from MITx/fix/will/checkbox_bug
Fixed checkbox bug in capa_module
2013-03-07 14:05:52 -08:00
Will Daly
6a54c2a2bc Fixed checkbox bug in capa_module 2013-03-07 17:01:56 -05:00
Will Daly
e86ed0db91 Merge branch 'master' into fix/will/mc_checkbox_bug 2013-03-07 12:07:34 -05:00
Will Daly
8d83d2fb4e Added handling of condition when no multiple choice item selected,
but the answer is incorrect.
2013-03-07 10:52:19 -05:00
Chris Dodge
9ba759802c make export a bit more resilient. If there's a piece of metadata that we can't serialize - i.e. someone wrote a new bool attribute and didn't put it in the type mapping table - then we log the exception and continue. 2013-03-07 10:43:36 -05:00
Will Daly
e841f29352 Updated CSS and template for choicegroup response
so that: a) checks/x marks appear after each option
for radio buttons, b) checks/x marks appear for the
entire problem (not individual options) for checkbox
buttons.

Also fixed issue with checks appearing on the next line
by changing <text> to display:inline instead of display:block
2013-03-07 10:17:03 -05:00
Victor Shnayder
5ec39825e0 Merge pull request #1604 from MITx/hotfix/jkarni/folditscore
Hotfix/jkarni/folditscore
2013-03-06 17:32:29 -08:00
Victor Shnayder
b6a6e10bb5 Fix max_attempts=''
That's what studio defaults to, and recent changes made it break.
Added a few tests to make sure it doesn't happen again.
2013-03-06 20:16:24 -05:00
Brian Wilson
b5ab766092 initial framework for htmlbook 2013-03-06 17:57:33 -05:00
jkarni
3bb108b12e Merge pull request #1608 from MITx/feature/jkarni/genex
Feature/jkarni/genex
2013-03-06 14:35:01 -08:00
Diana Huang
5c3dfd9280 Update correctmap to handle partially correct answers, and
fix annotation tests so that they use the new test_system functionality
2013-03-06 16:43:12 -05:00
Victor Shnayder
12b6b7d403 Merge pull request #1609 from MITx/diana/refactor-chemical-equation
Refactor Chemical Equation Preview
2013-03-06 12:09:03 -08:00
Victor Shnayder
fb350ed1e3 Merge pull request #1569 from MITx/feature/abarrett/annotatable_xmodule
Feature/abarrett/annotatable xmodule DO NOT MERGE
2013-03-06 12:05:27 -08:00
Diana Huang
42e711e7d2 Update tests and documentation. 2013-03-06 14:53:13 -05:00
Julian Arni
fb08942b63 Add 'get' default string 2013-03-06 14:49:36 -05:00
Diana Huang
1aa3580dcb Switch over to using the inputtype ajax handler for chemical input. 2013-03-06 14:41:48 -05:00
Arthur Barrett
dfc9176f6b fixed typo 2013-03-06 14:40:35 -05:00
Arthur Barrett
ddbab36439 Added instructions/documentation to the studio template for content authors. 2013-03-06 14:33:04 -05:00
Arthur Barrett
5029d3a3dd Merge branch 'feature/vik/advanced-studio' into feature/abarrett/annotatable_xmodule 2013-03-06 13:51:18 -05:00
Arthur Barrett
fd49aceb29 fixed highlight style for cascade. 2013-03-06 13:36:11 -05:00
Julian Arni
d05e82e35c Merge branch 'master' into feature/jkarni/genex 2013-03-06 13:25:30 -05:00
Arthur Barrett
9b32400b3a tweaked commentary textarea size so it looks correct in ff 2013-03-06 13:18:52 -05:00
Julian Arni
dfa590e71c Make exception a little more specific 2013-03-06 11:10:13 -05:00
Julian Arni
5682e02f53 Fix indendation that was causing only first submission to be saved 2013-03-06 11:05:10 -05:00
Diana Huang
4b7d1deb25 Fix a bug in extracting HTML
Update tests to reflect new behavior.
2013-03-06 10:34:57 -05:00