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

1250 Commits

Author SHA1 Message Date
Arthur Barrett
2f4d6f7bbf fixed doc block for annotationinput 2013-02-27 15:25:04 -05:00
Will Daly
3f81fe010c Implemented tests for ImageResponse 2013-02-27 15:05:21 -05:00
Arthur Barrett
1a0220c765 added a validation check on the input choice attribute 2013-02-27 15:04:30 -05:00
Arthur Barrett
44a68e6903 added partially correct icon from marco 2013-02-27 14:36:14 -05:00
Will Daly
53b3b79f96 Implemented tests of hints for <formularesponse> 2013-02-27 14:13:49 -05:00
Arthur Barrett
b84d0ba8ba updated comments 2013-02-27 14:04:49 -05:00
Arthur Barrett
9f8e172be9 show the status mark next to the submitted tag instead of at the bottom of the problem. 2013-02-27 13:35:10 -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
Arthur Barrett
25fb210338 move return link to problem header 2013-02-27 12:45:58 -05:00
Arthur Barrett
afa7fca15a Merge branch 'master' into feature/abarrett/annotatable_xmodule 2013-02-27 11:58:38 -05:00
Arthur Barrett
e3f12607cd add grading for annotationinput 2013-02-27 01:44:07 -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
jmclaus
cfc8a37aae Fully functional Genex 2013-02-24 12:02:06 -05:00
Arthur Barrett
c3f55845c0 factoring out discussion logic (for now, anyway) 2013-02-22 18:22:32 -05:00
Arthur Barrett
66ddfa295d more refactoring and work on annotationinput (should be working now). 2013-02-22 16:33:28 -05:00
Arthur Barrett
840f7839fa added save and render functionality to annotationinput 2013-02-22 12:48:22 -05:00
Arthur Barrett
78bf8d5876 update annotationinput jsonv alue on tag selection or comment change 2013-02-22 00:42:12 -05:00
Arthur Barrett
3970ea33e1 return from capa problem 2013-02-21 22:54:50 -05:00
Arthur Barrett
0e2c46a718 Clicking "reply to annotation" scrolls to the problem (specified in xml by problem=index). 2013-02-21 17:01:43 -05:00
Arthur Barrett
a8178de497 Added styling to the annotationinput capa problem. 2013-02-21 13:52:22 -05:00
Arthur Barrett
cc7f791078 parse xml for annotationinput 2013-02-20 19:19:17 -05:00
Victor Shnayder
c1c050a6b6 WIP on an inputtype for heroesX annotation 
- has a text area for saved but (currently) ungraded comments
- has a set of tags with weights
 2013-02-19 17:35:40 -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
Calen Pennington
4f555f6480 Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model 
Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/module_info_model.py
	cms/djangoapps/contentstore/tests/factories.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/djangoapps/models/settings/course_details.py
	cms/djangoapps/models/settings/course_grading.py
	cms/templates/edit_subsection.html
	common/djangoapps/mitxmako/shortcuts.py
	common/djangoapps/static_replace.py
	common/djangoapps/util/converters.py
	common/djangoapps/xmodule_modifiers.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/abtest_module.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/discussion_module.py
	common/lib/xmodule/xmodule/error_module.py
	common/lib/xmodule/xmodule/html_module.py
	common/lib/xmodule/xmodule/js/src/video/display.coffee
	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.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	common/lib/xmodule/xmodule/raw_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_export.py
	common/lib/xmodule/xmodule/tests/test_import.py
	common/lib/xmodule/xmodule/video_module.py
	common/lib/xmodule/xmodule/x_module.py
	common/lib/xmodule/xmodule/xml_module.py
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/django_comment_client/utils.py
	lms/templates/staff_problem_info.html
	lms/templates/video.html
	rakefile
 2013-02-07 15:12:30 -05:00
Julian Arni
8a75e1ad19 Added comment 2013-02-07 14:50:18 -05:00
Julian Arni
a770e34bec Adding multiple-choice loncapa integration. 2013-02-06 20:54:43 -05:00
jmclaus
5737f58b95 Added GWT Protex - reads target shape from xml writes answer to hidden input field 2013-02-06 20:48:25 -05:00
Victor Shnayder
edf96036c8 Merge remote-tracking branch 'origin/master' into 7012x-clean 2013-02-06 18:53:14 -05:00
Carlos Andrés Rocha
536333cbb5 Refactor how editamolecule displays messages 2013-02-06 18:31:00 -05:00
Carlos Andrés Rocha
d4afa02b12 Modify editamolecule to load GWT scripts dynamically 2013-02-06 17:40:44 -05:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Carlos Andrés Rocha
9bc25ff372 Replace editamolecule input type applet with GWT version 2013-02-05 20:15:50 -05:00