Commit Graph

646 Commits

Author SHA1 Message Date
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
Bridger Maxwell
69ba80bf63 Merge branch 'master' into MITx/feature/bridger/fast_course_grading 2012-08-06 18:51:59 -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
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
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
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
ichuang
c42960c172 add feature ENABLE_SQL_TRACKING_LOGS and url view /event_logs 2012-08-05 16:32:58 -04:00
ichuang
3c23235885 fix for some broken github edit links - avoids symlinks 2012-08-05 11:39:56 -04:00
ichuang
ebe6bf4888 remove some unnecessary debugging lines in xmodule_modifiers 2012-08-04 21:10:50 -04:00
ichuang
7fe75030cc fix staff edit link in module content display (goes to github) 2012-08-04 17:52:14 -04:00
ichuang
d50af5765e make university profile pages also use get_courses_by_university 2012-08-04 11:03:54 -04:00
ichuang
3f83904c12 if AUTH_REQUIRE_STAFF_FOR_COURSE then course list = those accessible 2012-08-04 10:19:54 -04:00
ichuang
30922fb449 add ACCESS_REQUIRE_STAFF_FOR_COURSE feature for enrollment check 2012-08-03 21:39:23 -04:00
ichuang
84ed806f0d start on lms migration path: view for loaded modules, and reload method 2012-08-03 20:20:35 -04:00
kimth
8aef6a0e75 Ajax doesn't complain about FormData if there's no file to be uploaded 2012-08-03 17:38:34 -04:00
kimth
8eff9f7caa Upload to xqueue 2012-08-03 17:11:55 -04:00
Bridger Maxwell
694520ebb2 StudentModuleCache now allows a list of descriptors. This speeds up grading significantly. 2012-08-03 17:00:04 -04:00
Calen Pennington
9b322f68b4 Merge pull request #337 from MITx/feature/victor/use-url-names
Feature/victor/use url names
2012-08-03 13:23:31 -07:00
Calen Pennington
b1494da02c Merge pull request #330 from MITx/ExternalAuth
External auth
2012-08-03 13:18:55 -07:00
kimth
9d52c43286 Add 'value' to filesubmission template 2012-08-03 15:49:30 -04:00
kimth
c25eded4fc Move xqueue_interface to lib/capa 2012-08-03 15:32:02 -04:00
Victor Shnayder
94e24c1626 Leftover name->url_name fixes 2012-08-03 14:45:43 -04:00
kimth
604596843c Time to think about file interface with xqueue 2012-08-03 14:39:30 -04:00
kimth
473bb817e8 File objects passed to responsetype only if responsetype explicitly allows filesubmissions 2012-08-03 14:34:48 -04:00
kimth
bfd441255a Every path except for 'get_score' gets filename instead of file object 2012-08-03 14:16:20 -04:00
kimth
cbb377d383 Answer dict values remain unicode, rather than str 2012-08-03 14:10:22 -04:00
kimth
afcd6fb1d7 Safe logging of File-included answers 2012-08-03 14:02:49 -04:00
kimth
eeaa1e0440 Capa util function to turn File objects in dict to filename (string) 2012-08-03 13:54:33 -04:00
Victor Shnayder
b46172da9b Rename module.name and descriptor.name to url_name
* update templates and code references
* also a display_name property that defaults to cleaned url_name
2012-08-03 11:36:54 -04:00
kimth
f023dc6e26 xqueue_interface generates hashkeys 2012-08-03 10:10:06 -04:00