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

106 Commits

Author SHA1 Message Date
Vik Paruchuri
badd3a8d13 Properly stub out the controller_qs variable in the tested module. Test times out without this. 2013-05-31 13:14:19 -04:00
Vik Paruchuri
5050eab74a Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor 2013-05-24 14:26:33 -04:00
Vik Paruchuri
3bd04290f5 Add tests, address review comments 2013-05-22 11:58:03 -04:00
Vik Paruchuri
d0e8965a3c Fix pep8/pylint issues 2013-05-20 16:42:27 -04:00
Vik Paruchuri
55fda26fd8 Fix tests, fix xqueue error, minor polish 2013-05-20 11:29:19 -04:00
Vik Paruchuri
6bdbbb62d5 Polish up editor, fix issues 2013-05-20 11:09:35 -04:00
Vik Paruchuri
682d06bcff Fix a lot of pep8 violations 2013-05-09 11:27:44 -04:00
Vik Paruchuri
7a1ef62ee3 Do some code reformatting 2013-05-09 09:56:02 -04:00
Vik Paruchuri
8c12eb78c9 Fix some exceptions 2013-05-09 09:54:57 -04:00
Vik Paruchuri
a2e5bd071b Add in tests for peer grading module 2013-05-08 19:17:14 -04:00
Vik Paruchuri
ff84545f31 Start to add peer grading tests, make dummy system a separate thing 2013-05-08 18:49:28 -04:00
Vik Paruchuri
4d759e9772 Test full flow, including reset 2013-05-08 18:15:57 -04:00
Vik Paruchuri
f26a258598 Add in test for grader reply 2013-05-08 18:07:17 -04:00
Vik Paruchuri
3801f574a4 Add in xqueue submission tests 2013-05-08 16:00:07 -04:00
cahrens
45f86b662a Delete unused file. 2013-04-24 14:59:32 -04:00
Vik Paruchuri
5125d8b0de Reformat code 2013-04-16 13:48:58 -04:00
Vik Paruchuri
65e2514334 Convert some exception clauses 2013-04-16 11:45:57 -04:00
Vik Paruchuri
2f6b7d1e44 Better max score handling 2013-04-16 11:41:35 -04:00
Vik Paruchuri
b1ea6b2012 Add in comments about max score calculation 2013-04-16 10:58:58 -04:00
Vik Paruchuri
dc7913dc1e Add in a log debug message for except clause. 2013-04-16 10:55:58 -04:00
Vik Paruchuri
418f218eec Fix some templates, minor code reformats 2013-04-09 15:33:11 -04:00
Vik Paruchuri
247ccc37a6 Code reformat, patch score gen 2013-04-09 14:47:26 -04:00
Vik Paruchuri
112fb4539b Correctly calculate score for combinedopenended and peer assessment 2013-04-09 14:43:41 -04:00
Vik Paruchuri
448c8121c3 Patch combinedopenended to work if self assessment is not first 2013-04-09 13:37:37 -04:00
cahrens
8ace7fe57c Merge branch 'master' into bug/christina/studio 
Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-04-01 12:30:07 -04:00
cahrens
16f4a3f9c1 Convert due date to a Date (vs. a string with no year). 2013-04-01 11:37:05 -04:00
Vik Paruchuri
0c218176d9 Run some code reformatting 2013-03-27 18:40:18 -04:00
Vik Paruchuri
df6d8fd2a3 Fix issues with progress page and open ended grading 2013-03-27 18:20:04 -04:00
Vik Paruchuri
4443afecaf Get rid of max score on open ended modules. Auto-calculate it from the rubric instead. 2013-03-27 18:05:00 -04:00
Vik Paruchuri
7101c76016 comment on rewrite links change 2013-03-27 12:02:32 -04:00
Vik Paruchuri
97cb4910a7 Add in default bucket, edit image url checks 2013-03-26 11:04:14 -04:00
Vik Paruchuri
8afe2eb001 Increase max score allowed 2013-03-26 10:35:47 -04:00
Vik Paruchuri
d4615da555 Adjust max image dim, add in safety for rewriting links 2013-03-26 09:57:52 -04:00
Vik Paruchuri
df935d422d Fix issues with open ended image grading and peer grading centralized module finder. 2013-03-26 09:52:26 -04:00
Diana Huang
eda6169b8b Pass along a url creator as opposed to just a url through 
the ModuleSystem.
 2013-03-20 09:23:25 -04:00
Calen Pennington
6b64b4214f Make relative imports explicitly relative 2013-03-15 11:23:22 -04:00
Calen Pennington
531eb80eb2 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.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/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	lms/djangoapps/open_ended_grading/tests.py
 2013-03-13 12:18:04 -04:00
Calen Pennington
92e99d7a8b Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields 2013-03-13 11:35:50 -04:00
Vik Paruchuri
c40ab310c3 Blank line fixes 2013-03-12 14:24:42 -04:00
Vik Paruchuri
554cb752fa Pep8 cleanup 2013-03-12 12:20:11 -04:00
Vik Paruchuri
19e3e79cfa Remove model data, save instance state after init 2013-03-12 11:30:08 -04: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
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
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
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