Commit Graph

5216 Commits

Author SHA1 Message Date
Will Daly
52c2f3ae37 Tested additional values of rerandomize (true/false/per_student)
Pylint fixes
2013-04-17 15:32:39 -04:00
Will Daly
754d1eb702 Added tests for ChoiceGroup template 2013-04-17 15:32:39 -04:00
Calen Pennington
6c7c49e6bd Fix pep8 violations 2013-04-17 11:07:58 -04:00
Calen Pennington
3cd414afbb Merge pull request #1825 from MITx/fix/cale/gradebook
Fix/cale/gradebook
2013-04-17 07:37:02 -07:00
Don Mitchell
24189378d6 Merge pull request #1864 from MITx/bug/christina/export
Don't try to export orphaned draft items.
2013-04-16 14:24:49 -07:00
cahrens
8c336ef998 Don't try to export orphaned draft items.
#278
2013-04-16 17:05:11 -04:00
Vik Paruchuri
5125d8b0de Reformat code 2013-04-16 13:48:58 -04:00
Vik Paruchuri
d82ac2b747 Merge remote-tracking branch 'origin/master' into fix/vik/sa-and-coe 2013-04-16 13:45:46 -04:00
brianhw
2314c609b6 Merge pull request #1859 from MITx/fix/brian/conditional-error
cope with ErrorModule as source (or required) module, and add tests.
2013-04-16 10:16:56 -07:00
Vik Paruchuri
a71658cf77 Better test for get score 2013-04-16 12:12:12 -04:00
Vik Paruchuri
36317b7d29 Fix failing test 2013-04-16 11:59:03 -04:00
Vik Paruchuri
701bdc55c0 Minor fixes 2013-04-16 11:55:54 -04:00
Vik Paruchuri
65e2514334 Convert some exception clauses 2013-04-16 11:45:57 -04:00
Calen Pennington
bf6b886ccd Fix pylint and pep8 errors 2013-04-16 11:45:21 -04:00
Vik Paruchuri
2f6b7d1e44 Better max score handling 2013-04-16 11:41:35 -04:00
Calen Pennington
13a485076f Properly save and restore settings.MODULESTORE, and clear at django._MODULESTORES at the end of the test 2013-04-16 11:40:04 -04:00
Calen Pennington
5f4004c5ad Clean up whitespace 2013-04-16 11:40:04 -04:00
Calen Pennington
6644b78819 Fix gradebook when using grade cutoffs other than A/B/C 2013-04-16 11:38:58 -04:00
Vik Paruchuri
338a57768f Remove try except block for pg scoring 2013-04-16 11:01:57 -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
0d4b9d26cf Add in a test, rescale preview images 2013-04-16 10:51:23 -04:00
Vik Paruchuri
9acc592279 Comments for hotkeys 2013-04-16 10:23:08 -04:00
Jay Zoldak
f0fb77845e Merge pull request #1856 from MITx/fix/will/pep8-fixes
Pep8 fixes for drag and drop tests
2013-04-16 06:48:44 -07:00
Brian Wilson
7486e0f637 cope with ErrorModule as source (or required) module, and add tests. 2013-04-16 01:00:46 -04:00
Will Daly
917945807b Pep8 fixes for drag and drop tests 2013-04-12 16:37:52 -04:00
Chris Dodge
8ece663284 more drive by violation fixes 2013-04-12 15:45:27 -04:00
Chris Dodge
6d6b3a59fe violation fixes 2013-04-12 15:27:36 -04:00
Diana Huang
ff1189c5e8 Pylint and Pep8 fixes 2013-04-12 13:23:42 -04:00
Diana Huang
06a54a8c38 Consolidate tests into one larger test 2013-04-12 10:59:03 -04:00
Diana Huang
ab7a616552 Add the ability to handle escaped HTML characters in trailing text
Add tests for unicode and escaped HTML characters
2013-04-12 10:59:03 -04:00
Diana Huang
d6e722a698 Remove unnecessary check and add better textline documentation 2013-04-12 10:59:03 -04:00
Diana Huang
fd35b2c7e3 Fix and create new test for trailing text 2013-04-12 10:59:03 -04:00
Diana Huang
c93b8076bf Add trailing text to textlines, most useful for units. 2013-04-12 10:59:03 -04:00
Chris Dodge
1a3c622bb6 actually the query parameter is '_id.revision' not just 'revision' 2013-04-11 22:32:35 -04:00
Chris Dodge
cf7d7bd2d9 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements 2013-04-11 22:12:17 -04:00
Chris Dodge
8fd8574357 get_items has an query ambiguity with respect to revision=None. None has a special semantic in get_items as a wildcard, so if we query with 'None' then we'll get back both draft and non-draft items. 2013-04-11 22:10:30 -04:00
Christina Roberts
c455710cca Merge pull request #1815 from MITx/fix/cdodge/studio-forum-improvements
Fix/cdodge/studio forum improvements
2013-04-11 10:37:49 -07:00
Vik Paruchuri
358482c55b Add in test for child weight 2013-04-11 11:54:00 -04:00
Vik Paruchuri
4d3b4a60d6 Significantly less verbose test code 2013-04-11 11:51:27 -04:00
Vik Paruchuri
442d0fcf4f Add tests for orderings with only one task 2013-04-10 17:41:10 -04:00
Vik Paruchuri
09e18cb815 Add in tests for alternate xml orderings 2013-04-10 17:38:31 -04:00
Vik Paruchuri
ca2eb9cd1b Add in tests for combinedopenended scoring 2013-04-10 17:33:43 -04:00
Vik Paruchuri
820a2b407a Add in js image upload preview 2013-04-10 17:06:02 -04:00
Vik Paruchuri
9f04769c00 Better confirmation for flagging 2013-04-10 16:16:13 -04:00
Don Mitchell
f6434ed4fb Merge pull request #1840 from MITx/fix/cdodge/export-draft-modules
Fix/cdodge/export draft modules
2013-04-10 13:12:09 -07:00
Vik Paruchuri
a64d57ae1d Add popup when flag box is checked 2013-04-10 16:01:56 -04:00
Vik Paruchuri
2a5631da86 Code cleanup 2013-04-10 15:26:45 -04:00
Vik Paruchuri
cef4d0cb09 Display instructor feedback 2013-04-10 15:25:05 -04:00
Vik Paruchuri
799c8282bc Fix hotkeys for combined open ended 2013-04-10 15:15:22 -04:00