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

1366 Commits

Author SHA1 Message Date
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
jmclaus
d74b21e444 Added edit a gene 2013-02-05 20:15:50 -05:00
jmclaus
bc3f373edf Added design protein 2D 2013-02-05 20:15:49 -05:00
Carlos Andrés Rocha
11db1190e6 WIP Save edit-a-molecule state in input field 
Also add reset button and fix run condition from the GWT loader in Firefox
 2013-02-05 20:15:49 -05:00
Carlos Andrés Rocha
41cce2d84f WIP Rename edit-a-molecule files to be more consistent 2013-02-05 20:15:49 -05:00
Carlos Andrés Rocha
b864770da4 WIP show edit-a-molecule applet 2013-02-05 20:15:49 -05:00
Carlos Andrés Rocha
efaaf58db5 WIP restore chemicalequationinput template 2013-02-05 20:15:49 -05:00
Carlos Andrés Rocha
f68f023e35 WIP integration of edit-a-molecule 2013-02-05 20:15:48 -05:00
Victor Shnayder
c5b86f3e81 Initial template for edit a molecule input 2013-02-05 20:15:48 -05:00
Carlos Andrés Rocha
d0d15c0dc2 Import edit-a-molecule resources 2013-02-05 20:15:48 -05:00
Vik Paruchuri
e8a690df5e Update peer grading tests 2013-02-05 10:46:00 -05:00
Calen Pennington
75b0a8eed6 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2013-01-22 14:47:52 -05:00
Alexander Kryklia
91281915c4 update of deleted comment 2013-01-21 19:28:49 +02:00
Alexander Kryklia
00f966a94a populate -> __init__ 2013-01-21 19:22:23 +02:00
Alexander Kryklia
a95e809824 documentation extended 2013-01-21 19:05:30 +02:00
Alexander Kryklia
2d67ee477e commend about rule in simple form 2013-01-21 18:58:30 +02:00
Alexander Kryklia
0f5e7cd9e4 explained for - else 2013-01-21 18:55:29 +02:00
Alexander Kryklia
e78c020a52 removed dublicate comment 2013-01-21 18:38:03 +02:00
Alexander Kryklia
07c1085966 improved readability of drag and drop render test 2013-01-21 18:33:17 +02:00
Alexander Kryklia
3e0333309d removed openendedinput 2013-01-21 18:03:04 +02:00
Alexander Kryklia
a228c163c7 added test for alternative answer notation 2013-01-21 15:56:38 +02:00
Alexander Kryklia
4215f4f923 add and update tests 2013-01-21 15:56:37 +02:00
Alexander Kryklia
e47f0e45f2 unorderly->unordered 2013-01-21 15:56:36 +02:00
Alexander Kryklia
e017297d3f fix 2013-01-21 15:56:36 +02:00
Alexander Kryklia
c8bbcacfef labels reuse logic and tests 2013-01-21 15:56:36 +02:00
Alexander Kryklia
e2bbaf08b9 removed use_targets flag 2013-01-21 15:56:35 +02:00
Alexander Kryklia
0349e157b5 renamed graders to verifiers 2013-01-21 15:56:35 +02:00
Alexander Kryklia
63b79f76d7 added can_reuse 2013-01-21 15:56:35 +02:00
Alexander Kryklia
f157702548 fix 2013-01-21 15:56:35 +02:00
Alexander Kryklia
c2dec3fb9d label bg color 2013-01-21 15:56:35 +02:00
Alexander Kryklia
65fd71d06b added documentation for rules 2013-01-21 15:56:34 +02:00
Alexander Kryklia
b540ca492a removed old flag use_targets 2013-01-21 15:56:34 +02:00
Alexander Kryklia
5c58881222 tests for drag and drop 2013-01-21 15:56:34 +02:00
Alexander Kryklia
01e4bdb831 added test for populate 2013-01-21 15:56:34 +02:00
Alexander Kryklia
e66e4040b1 replaced ordereddict with dict 2013-01-21 15:56:33 +02:00