Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,191 Commits 1 Branch 0 Tags
c23c5cc3d99c1772c339bc287c7c78de00945ea8
Commit Graph

3652 Commits

Author SHA1 Message Date
Chris Dodge
c23c5cc3d9 add comments 2013-03-07 16:12:21 -05:00
Christina Roberts
cb70a0f9d9 Merge pull request #1620 from MITx/fix/cdodge/static-url-allow-references-to-common 
need to support link references to static content that is in the code ba...
 2013-03-07 13:07:16 -08:00
Chris Dodge
891bddcdf9 need to support link references to static content that is in the code base (e.g. module's .js/.css) 2013-03-07 14:28:09 -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
Victor Shnayder
57700a56d4 remove links to missing image files. We can add them if needed later. 2013-03-06 19:11:36 -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
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
17680a332a More comments. 2013-03-06 09:06:43 -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
Will Daly
42043d2ccc Added tests for capa module save_problem() 2013-03-05 12:01:04 -05:00
Will Daly
6ec3b94d0c Added test for capa module closed() method; modified 
closed() to handle edge cases
 2013-03-05 11:47:41 -05:00
Will Daly
49784009d5 Fixed incorrect doc string 2013-03-05 11:23:14 -05:00
Will Daly
21af0493fd Added unit tests for capa_module reset_problem() 2013-03-05 11:21:28 -05:00
cahrens
cc234d45e7 Don't collapse multiple underscores for asset names. 
#202
 2013-03-05 10:55:27 -05:00
Vik Paruchuri
d03fe79e07 Small metadata naming fix 2013-03-05 10:36:22 -05:00