Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

7928 Commits

Author SHA1 Message Date
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
Calen Pennington
094b18972c Append course modules to list of courses during import 2013-03-06 18:14:14 -05:00
Calen Pennington
cec3475c9d Remove references to .definition and .metadata in modules 2013-03-06 18:07:56 -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
Calen Pennington
5222c61d73 Fix how the 'empty' field is excluded from html_module editable fields 2013-03-06 16:34:21 -05:00
Calen Pennington
4327aa1885 If we can't parse policy, then set it to an empty dictionary 2013-03-06 15:18:03 -05:00
Calen Pennington
4cbae2269c Clean up how grading policy is set 2013-03-06 15:12:54 -05:00
Calen Pennington
e7900859b6 Remove the 'title' alias for lms.display_name 2013-03-06 15:11:08 -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
Calen Pennington
3b7a589e5a Merge remote-tracking branch 'origin/feature/alex/poll-merged' into feature/alex/poll-merged 2013-03-06 12:58:24 -05:00
Vasyl Nakvasiuk
aa026387ce Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged 2013-03-06 19:52:28 +02:00
Vasyl Nakvasiuk
493421c1ec fix test_conditional, add new conditional to "conditional_and_poll" test course 2013-03-06 19:52:18 +02:00
Vik Paruchuri
7871fce7ff Merge branch 'feature/vik/fix-oe-storage' into feature/vik/storage-model-fixes 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-03-06 12:49:11 -05:00
Vik Paruchuri
b75b091581 Remove 2 more debug statements 2013-03-06 12:27:22 -05:00
Vik Paruchuri
c1218e8c08 Remove debug statements 2013-03-06 12:26:23 -05:00
Calen Pennington
8a9ba79d1f Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-03-06 12:15:07 -05:00
Vik Paruchuri
f73979d03b Generate less db inserts 2013-03-06 11:57:14 -05:00
Vik Paruchuri
d20fc439ec Fix peer grading boolean parsing 2013-03-06 11:47:48 -05:00
Vik Paruchuri
3329af077a Force instance state to save periodically 2013-03-06 11:29:25 -05:00
Vik Paruchuri
7ea3d70c2c Caching attribute values from child module 2013-03-06 11:21:42 -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
Vasyl Nakvasiuk
06001c8c1e fix test_logic 2013-03-06 17:10:15 +02: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
Vik Paruchuri
b7c6f7ca1a Mostly working state 2013-03-05 19:16:02 -05:00
Vik Paruchuri
0d777a7a0e Convert to passing in current task state again 2013-03-05 17:53:06 -05:00
Vik Paruchuri
904ed6c80f Combined open ended renders correctly, but internal state tracking broken 2013-03-05 17:48:39 -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
Vik Paruchuri
697e426ce6 Switch to passing through entire task state 2013-03-05 16:58:59 -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