kimth
b6dc622e42
Remove temporary datetime
2012-08-07 11:43:00 -04:00
kimth
c39edb650b
StudentModule lookups in queue callback use target user, rather than request.user
2012-08-07 11:38:04 -04:00
kimth
501f2ccf14
CodeResponse uses 'is_file' helper function
2012-08-07 11:30:21 -04:00
kimth
f6202e5631
Tests provide xqueue params, rather than ModuleSystem.__init__
2012-08-07 11:16:48 -04: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
c5fa6bac89
Merge pull request #353 from MITx/ichuang/showhide-staff-debug
...
make the staff debug information appear in a show/hide span
2012-08-07 05:43:14 -07: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
kimth
49b1678bf4
Merge pull request #354 from MITx/arjun/grading_fix
...
arjun/grading fix
2012-08-06 22:28:57 -07: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
ichuang
fa8bf7f371
make the staff debug information appear in a show/hide span
2012-08-06 21:54:29 -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
Bridger Maxwell
873f1431ec
Put back dynamic grade cutoffs and final grade rounding (from stable-end-of-course)
2012-08-06 18:51:11 -04:00
ichuang
926763a3d6
Merge pull request #351 from MITx/edit-link-fix
...
Edit link fix
2012-08-06 15:44:34 -07:00
ichuang
6dfbb222ab
Merge branch 'master' of github.com:MITx/mitx
2012-08-06 18:41:18 -04:00
ichuang
ff5773c0d9
Merge pull request #348 from MITx/kimth/lms-coderesponse
...
merging this now because the it looks ok, and it fixes some bugs introduced by the last xserver merge, which are preventing the LMS from running in the current version of master.
2012-08-06 15:40:56 -07: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
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
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
Calen Pennington
291cbac838
Merge pull request #342 from MITx/lms-migration
...
LMS migration
2012-08-06 11:51:50 -07:00
ichuang
9805ed8962
cleanup syntax, split long if into two lines
2012-08-06 14:37:17 -04:00
ichuang
8a1747770a
redirect to course_about page if hit internal course page unregistered for
2012-08-06 14:30:53 -04:00
ichuang
b1ddff838c
add comment about course start date logic
2012-08-06 14:23:55 -04:00
ichuang
6f894c816c
use jquery for error msg in course_about
2012-08-06 14:19:45 -04:00
ichuang
871ed954be
ACCESS_REQUIRE_STAFF_FOR_COURSE default False in lms.envs.dev
2012-08-06 14:16:11 -04:00
ichuang
3484f5382c
isinstance instead of type
2012-08-06 14:10:00 -04:00
Bridger Maxwell
fb7ff47b15
Accidentally commited local changes to envs.
2012-08-06 14:03:49 -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
Bridger Maxwell
a9c122d737
Removed cache for UserTestGroup in debug mode.
2012-08-06 11:37:47 -04:00
