Victor Shnayder
6ed9052755
minor cleanups
2012-08-07 11:06:46 -04:00
Victor Shnayder
b285f50d92
Make unknown metadata persist accross import-export
...
* +improve test.
2012-08-07 11:06:46 -04:00
Victor Shnayder
d09e2261f3
New file structure--everything in own file
...
* needed for CMS performance (can now save just an item, not whole tree)
* remove split_to_file methods
* simplified AttrMap logic
* write each descriptor to a separate file
* detect format on import and adjust appropriately.
* update tests
2012-08-07 11:06:46 -04:00
ichuang
ca177570fa
Merge pull request #356 from MITx/kimth/lms-coderesponse
...
Kimth/lms coderesponse
2012-08-07 07:56:23 -07:00
ichuang
4c25baee43
Merge pull request #355 from MITx/arjun/choicegroup_text
...
Removing the <text> wrapper around choice text for radiogroup and checkboxgroup
2012-08-07 07:55:01 -07:00
kimth
cb2fbfa54c
Added test for answers file-to-filename conversion
2012-08-07 09:38:36 -04:00
kimth
ceeea66417
Fix overrzealous file_to_filename conversion and fix CapaProblem unit tests
2012-08-07 09:24:17 -04:00
Calen Pennington
e14ebaafc3
Merge pull request #345 from MITx/MITx/feature/bridger/fast_course_grading
...
Fast grading
2012-08-07 05:39:18 -07:00
Bridger Maxwell
3a52e86a87
Fixed weighting of individual problems. Unmodified problems have weight None, not 1.
2012-08-07 08:00:06 -04:00
Bridger Maxwell
8287e5a13f
Fixed grading bug where list comprehension variable overrode local variable.
2012-08-07 07:33:35 -04:00
Arjun Singh
0c4ad3b152
Converting seed to str to allow for using Mock objects as a seed during tests.
2012-08-07 04:30:19 -04:00
Arjun Singh
332dd8c99e
Adding tests for javascript response; required copying files that would exist in other places in the main LMS to test_files because the test environment is fragile. This tests the code, but not the environment.
2012-08-07 04:29:45 -04:00
Arjun Singh
7cd8ffff3d
Cleans up node calls and (barely) improves security as subprocess.Popen will escape arguments properly. This means that instructors cannot set the grader/generator to ;/bin/rm -rf *; however, the python and node environments are not sandboxed at all and so instructors can still run arbitrarily malicious code.
2012-08-07 03:55:01 -04:00
Arjun Singh
fb6dbb120e
Fixing dependency system for javascriptresponses. In particular, adding a location for node-only packages (that are never sent to the client) in lms/lib/node_modules and adding lms/static/js, lms/static/coffee/* to the NODE_PATH, along with the course's data directory.
2012-08-07 03:28:35 -04:00
Arjun Singh
19fa50a882
Removing the <text> wrapper around choice text for radiogroup and checkboxgroup.
2012-08-07 02:38:23 -04:00
Arjun Singh
323fb18c74
Poor fix for a breaking change in which student answers that were arrays (e.g. those resulting from a checkbox group) would be converted to strings and graded incorrectly.
2012-08-07 00:14:48 -04:00
Arjun Singh
96746721c4
Fixed incorrect default argument so that tests run; however the new value is incorrect and needs to be fixed.
2012-08-07 00:11:39 -04:00
Rocky Duan
0ae68e7324
Merge branch 'master' of github.com:MITx/mitx into merge
...
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/course_navigation.html
2012-08-06 22:38:31 -04:00
kimth
0940a3cc83
Merge pull request #352 from MITx/kimth/lms-coderesponse
...
Don't contact queueing server on Django load
2012-08-06 16:09:56 -07:00
kimth
d3f4746f57
Don't contact queueing server on Django load
2012-08-06 19:02:40 -04:00
Bridger Maxwell
69ba80bf63
Merge branch 'master' into MITx/feature/bridger/fast_course_grading
2012-08-06 18:51:59 -04:00
Arjun Singh
88d672e862
Add hashlib back into responsetypes temporarily.
2012-08-06 18:49:59 -04:00
Arjun Singh
2f84e0ca78
Merge master
2012-08-06 18:48:17 -04:00
ichuang
9728b429b7
Merge branch 'kimth/lms-coderesponse' of github.com:MITx/mitx
2012-08-06 18:36:11 -04:00
ichuang
f47ab30c3f
small fix to xmodule_modifiers to fix case when filename missing
2012-08-06 18:34:54 -04:00
Arjun Singh
99e7d0076e
Adding a method of executing scripts fetched via AJAX in IE8+. Also adds inputtype-specific handlers so that javascript can be executed when an inputtype is encountered.
2012-08-06 18:11:23 -04:00
Arjun Singh
2337eeba1e
Adding javascriptresponse. This responsetype is a framework for problems that are entirely controlled by javascript and graded by Node.js on the server.
2012-08-06 18:11:23 -04:00
kimth
18a7f58735
Handle xreply parsing errors more gracefully
2012-08-06 17:44:07 -04:00
kimth
b6e9e7a4bb
Handle network errors more gracefully
2012-08-06 17:36:38 -04:00
kimth
ae11f91880
Queue submission reports queue length
2012-08-06 16:56:44 -04:00
Kyle Fiedler
99c3a7996a
Fix color of speed dropdown
2012-08-06 16:49:29 -04:00
Bridger Maxwell
4fedca5bf9
Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading
...
Conflicts:
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
2012-08-06 16:49:05 -04:00
kimth
00486819c2
Make CodeMirror more pleasant for 6.00
2012-08-06 16:47:24 -04:00
Bridger Maxwell
baa2b14405
Changed interface of StudentModuleCache. Other changes from code review.
2012-08-06 16:36:53 -04:00
kimth
c2e351523f
Update ModuleSystem
2012-08-06 16:28:15 -04:00
kimth
4e6808bb47
Merge master
2012-08-06 16:26:25 -04:00
kimth
41e7d72ea8
Xqueue interface is embedded in ModuleSystem
2012-08-06 16:13:35 -04:00
kimth
7cc502c886
Refactor list of inputs in ajax
2012-08-06 15:44:27 -04:00
Calen Pennington
24f85bf202
Merge pull request #340 from MITx/kimth/lms-coderesponse
...
Kimth/lms coderesponse
2012-08-06 12:17:15 -07:00
kimth
110637c023
XqueueInterface is a singleton instantiated object
2012-08-06 15:06:19 -04:00
ichuang
9805ed8962
cleanup syntax, split long if into two lines
2012-08-06 14:37:17 -04:00
Bridger Maxwell
d7cab471f2
Accidentally had left a print statement commented out.
2012-08-06 14:00:45 -04:00
ichuang
a46a37d1c0
log.debug -> log.exception; revert log change in xml_module
2012-08-06 13:58:42 -04:00
Bridger Maxwell
ba42c0225d
Moved the generation of the 'grading context' to a lazy property in course descriptor.
2012-08-06 13:57:41 -04:00
kimth
6c875206bc
Simplify file submission front end
2012-08-06 12:44:19 -04:00
kimth
c950d437e5
Add comments on CodeResponse.get_score
2012-08-06 11:58:00 -04:00
Bridger Maxwell
2348f71cc6
Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading
...
Conflicts:
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/views.py
2012-08-06 11:48:42 -04:00
Calen Pennington
8059008bde
Switch from exception logging middleware to a django signal handler, so that we no longer swallow Http404 exceptions and turn them into 500 errors
2012-08-06 10:13:12 -04:00
kimth
881cafb88d
Moved default parameter assignment to function def, parse_xreply util function
2012-08-06 09:14:09 -04:00
ichuang
553f7046b4
suggested username for ssl auth is conjoined name with no spaces
2012-08-05 21:12:56 -04:00
