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

659 Commits

Author SHA1 Message Date
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
Vasyl Nakvasiuk
bb69e9fab6 fix dnd tests 2013-03-06 14:30:29 +02:00
Vasyl Nakvasiuk
f71c43f77b fix self.excess_draggables 2013-03-06 14:28:10 +02:00
Calen Pennington
35551049ef Merge remote-tracking branch 'origin/feature/vik/fix-oe-storage' into feature/alex/poll-merged 2013-03-05 15:05:47 -05:00
Vasyl Nakvasiuk
0d83fefecf merge feature/alex/drag_and_drop-mitx into feature/alex/poll-merged 2013-03-05 18:20:38 +02:00
Vik Paruchuri
02539a3bc8 Start converting COE storage model 2013-03-04 17:06:39 -05:00
Calen Pennington
1bfb933518 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	cms/templates/edit_subsection.html
	cms/templates/overview.html
	cms/templates/unit.html
	cms/templates/widgets/header.html
	common/djangoapps/course_groups/tests/tests.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/js/src/.gitignore
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml_exporter.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/open_ended_grading/tests.py
 2013-03-04 16:33:40 -05:00
Victor Shnayder
df5ad6ba42 Merge pull request #1574 from MITx/fix/will/cs191_matrix_style_bug 
Fix/will/cs191 matrix style bug
 2013-03-04 12:28:12 -08:00
Will Daly
548f9b85a8 Changed response_msg argument default to '' 2013-03-01 17:07:23 -05:00
Will Daly
28a502ea97 Fixed a bug in CorrectMaps.get_npoints(), which would return 1 
when npoints=0.
 2013-03-01 16:40:54 -05:00
Victor Shnayder
88bfdd01ce Merge pull request #1561 from MITx/feature/will/move_correct_mark_for_multiple_choice 
Feature/will/move correct mark for multiple choice
 2013-03-01 12:52:26 -08:00
Will Daly
d6df7e2d96 Added comments to clean_message_html 2013-03-01 15:04:01 -05:00
Will Daly
8265181477 If there are multiple inputs, but only one message specified, 
the message is now applied to the entire response.
 2013-03-01 11:17:31 -05:00
e0d
4e10eb10e3 locking deps versions based on pip freeze in production. 2013-03-01 10:15:07 -05:00
Will Daly
9ac8ef542f Overall message HTMl now correctly renders when multiple HTML tags are 
passed as the message (even when there's no root tag)
 2013-03-01 09:40:38 -05:00
Will Daly
952716af13 Added clean-up code for message HTML. 
If overall message is a parseable XHTML tree,
it is inserted as a tree rather than text.
 2013-03-01 09:40:38 -05:00
Will Daly
68cf4c4535 Added tests for HTMl rendering of problems 
Added support for rendering response messages
 2013-03-01 09:40:38 -05:00
Will Daly
9f6119a19a * Fixed a bug in CorrectMap in which overall_message was not copied 
in the update() method
* Implemented CustomResponse behavior for returning overall_message,
  with unit tests
* Added additional CustomResponse unit tests for exception handling
 2013-03-01 09:40:38 -05:00
Will Daly
3dd49881c3 * Wrote unit tests for correctmap. 
* Fixed potential KeyError in correctmap.get_queue_time_str()
* Modified correctmap.get_npoints() to return 0 if answer is incorrect,
    even when npoints has been set.
* Added overall_message attribute to CorrectMap to allow
messages that apply to the entire question, not just an individual input
 2013-03-01 09:40:38 -05:00
Diana Huang
9429262ca4 Merge pull request #1563 from MITx/fix/will/capa_response_unit_tests 
Fix/will/capa response unit tests
 2013-02-28 07:05:15 -08:00
Will Daly
71d0a367aa Fixed an error in the JavascriptResponseTest: coffee files 
were not being compiled before the LoncapaProblem initializer was
called.
 2013-02-28 09:45:27 -05:00
Will Daly
7e48de1ef3 Reset responsetypes.py to version on master 2013-02-27 17:22:26 -05:00
Will Daly
487afad50d Merge branch 'master' into feature/will/move_correct_mark_for_multiple_choice 2013-02-27 16:58:35 -05:00
Will Daly
043d316d53 Removed test files that are now replaced with XML Factories 2013-02-27 16:40:48 -05:00
Will Daly
ce7256eda9 Removed unused SymbolicResponseXMLFactory 2013-02-27 16:40:05 -05:00
Will Daly
c1324ec21d Modified CodeResponse to use XML factory 2013-02-27 16:25:19 -05:00
Will Daly
6e4c418a11 Updated JavscriptResponse to use XML factory 2013-02-27 15:26:29 -05:00
Will Daly
3f81fe010c Implemented tests for ImageResponse 2013-02-27 15:05:21 -05:00
Will Daly
53b3b79f96 Implemented tests of hints for <formularesponse> 2013-02-27 14:13:49 -05:00
Will Daly
9fe305e02b Modified ChoiceGroup to display correct/incorrect indicators 
(check or x) next to the option the user selected (check boxes or radio
buttons).
 2013-02-27 13:05:29 -05:00
Will Daly
9360c3fa9a Added test for StringResponse hints 2013-02-26 16:55:18 -05:00
Will Daly
4ed229e8e8 Modified StringResponse test to use XML factory and 
to check case-insensitivity.
 2013-02-26 16:31:34 -05:00
Will Daly
1060ce495d Modified OptionResponseTest to use XML factory 2013-02-26 16:14:59 -05:00
Will Daly
ee22a50d92 Moved problem initialization into ResponseTest base class. 2013-02-26 15:44:15 -05:00
Will Daly
a4dfc0f440 Added tests for TrueFalseResponse. Cleaned up tests by 
creating common base class.
 2013-02-26 15:35:55 -05:00
Will Daly
c225af4e4d Modified ChoiceResponse to use XML generated by factory. 2013-02-26 14:33:46 -05:00
Will Daly
a7fcb7d6be Added tests for <schematicresponse> 2013-02-26 13:38:58 -05:00
Will Daly
f2bb9a2dbc Implemented unit tests for <customresponse> 2013-02-26 10:43:30 -05:00
John Hess
ac7fe0631a fixed excess_draggable behavior so that true means it is actually excess 2013-02-25 19:20:37 -05:00
John Hess
fbce425152 drag and drop now correctly handles cases where no draggables should be dragged 2013-02-25 18:42:34 -05:00
Will Daly
8b5473b6f6 Wrote unit tests for NumericalResponse capa response type 2013-02-25 15:30:55 -05:00
Alexander Kryklia
059b9f66e3 poll and conditional finished 2013-02-15 18:48:39 +02:00
Victor Shnayder
e352226df5 Merge remote-tracking branch 'origin/master' into 700x-sandbox 2013-02-14 09:19:25 -05:00
ichuang
e413d16bff allow "rows" attrib of coderesponse textbox to set box height 2013-02-13 21:25:31 -05:00
Calen Pennington
793bbfd351 Set up dev environment for testing xml vs mongo vs split_mongo modulestores 2013-02-13 14:04:21 -05:00
Julian Arni
9785bc9e70 Adding multiple-choice loncapa integration. 2013-02-12 17:21:34 -05:00
jkarni
2197bd987f Merge pull request #1461 from MITx/feature/julian/multiple-choice-tweaks 
Feature/julian/multiple choice tweaks
 2013-02-12 13:32:15 -08:00
Victor Shnayder
75898bfe1a tell collectstatic not to mess with protex--it relies on the filename 2013-02-11 17:54:54 -05:00
David Ormsbee
fb1e7f3dc1 Make type check for self.code a little more robust, give default val for mmlans so it's never undefined 2013-02-10 19:03:25 -05:00
Calen Pennington
dd4db0601f Remove generated files 2013-02-08 10:45:59 -05:00