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
Julian Arni
588b27c9dc
Added Descriptor method, fixed order issue.
2013-03-11 11:17:12 -04: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
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
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
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
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
Julian Arni
fb08942b63
Add 'get' default string
2013-03-06 14:49:36 -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
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
455dea870f
Remove unnecessary import.
2013-03-06 09:21:37 -05:00
Diana Huang
78424e1670
Fix some of the tests so that they work with the new changes
...
to capa_problem
2013-03-06 09:19:22 -05:00
Diana Huang
9b640aa06b
Add more documentation and fix naming.
2013-03-06 09:06:43 -05:00
Diana Huang
385a62d7d1
Handle multiple inputs properly for ajax handling.
2013-03-06 09:06:43 -05:00
Diana Huang
6f535d9e0b
Fix test rendering so we can parse the problem during tests without it breaking.
2013-03-06 09:06:43 -05:00
Diana Huang
9545a82ab9
Add the ability to make ajax calls on the input type of capa problems.
2013-03-06 09:04:54 -05:00
Diana Huang
f8adfc6244
Merge pull request #1602 from MITx/fix/will/capa_xmodule_unit_tests
...
Fix/will/capa xmodule unit tests
2013-03-06 06:03:17 -08:00
Arthur Barrett
0424b53336
show the annotation callout at the span center rather than at the mouse
2013-03-06 00:05:41 -05:00
Arthur Barrett
3393e6385d
set a default height on the commentary textbox to show 5 lines of text
2013-03-06 00:05:36 -05:00
Arthur Barrett
2ed7394f27
visually distinguish instructions from guided discussion section
2013-03-06 00:05:28 -05:00
Will Daly
c7d80a91ee
Changed name of survey_question to is_survey_question for clarity
2013-03-05 17:30:38 -05:00
Will Daly
43d8574e92
Refactored use of test_system in xmodule unit tests
...
so that a new one is created for each test
2013-03-05 17:26:15 -05:00
Will Daly
73281a43c9
Added tests for get_problem_html, including error conditions
2013-03-05 17:02:12 -05:00
Will Daly
40d7e8addf
Moved problem HTML error handling to its own function
2013-03-05 15:43:47 -05:00
Will Daly
608552429f
Refactored capa module HTML rendering, isolating logic for
...
determining which buttons to show
2013-03-05 15:35:14 -05:00
Christina Roberts
e093431d75
Merge pull request #1581 from MITx/feature/vik/advanced-studio
...
Feature/vik/advanced studio
2013-03-05 12:28:29 -08:00
Vik Paruchuri
9475c6edac
Address review comments
2013-03-05 14:41:08 -05:00
