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 |
|
Bridger Maxwell
|
baa2b14405
|
Changed interface of StudentModuleCache. Other changes from code review.
|
2012-08-06 16:36:53 -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 |
|
Bridger Maxwell
|
cbab4f1006
|
Fixed some imports on gradebook.html
|
2012-08-06 11:32:26 -04:00 |
|
Bridger Maxwell
|
7f5246f653
|
Removed test view for grading.
|
2012-08-06 10:17:53 -04:00 |
|
kimth
|
881cafb88d
|
Moved default parameter assignment to function def, parse_xreply util function
|
2012-08-06 09:14:09 -04:00 |
|
ichuang
|
7607444286
|
fix bug: course staff group based on dir_name, not course number
|
2012-08-05 23:26:31 -04:00 |
|
ichuang
|
553f7046b4
|
suggested username for ssl auth is conjoined name with no spaces
|
2012-08-05 21:12:56 -04:00 |
|
ichuang
|
0347eb498c
|
add MITX_FEATURES flags to enable textbook and discussion,
and modify course_navigation correspondingly
|
2012-08-05 20:24:00 -04:00 |
|
ichuang
|
190f1f8f89
|
tracking_log template
|
2012-08-05 16:35:32 -04:00 |
|
ichuang
|
b612517dde
|
Merge branch 'lms-migration' of github.com:MITx/mitx into lms-migration
|
2012-08-05 16:33:58 -04:00 |
|
ichuang
|
c42960c172
|
add feature ENABLE_SQL_TRACKING_LOGS and url view /event_logs
|
2012-08-05 16:32:58 -04:00 |
|
ichuang
|
3ee224e399
|
improve create_user script slightly, to auto-grab fullname for MIT users
|
2012-08-05 12:39:13 -04:00 |
|
ichuang
|
3c23235885
|
fix for some broken github edit links - avoids symlinks
|
2012-08-05 11:39:56 -04:00 |
|
ichuang
|
1ff49aa3f9
|
remove unnecessary comments from util-scripts/*
|
2012-08-04 21:15:51 -04:00 |
|
ichuang
|
9db88b0b52
|
fix comment in dev.py
|
2012-08-04 21:13:43 -04:00 |
|
ichuang
|
f0850e25a8
|
Merge branch 'lms-migration' of github.com:MITx/mitx into lms-migration
|
2012-08-04 21:11:27 -04:00 |
|
ichuang
|
ebe6bf4888
|
remove some unnecessary debugging lines in xmodule_modifiers
|
2012-08-04 21:10:50 -04:00 |
|
ichuang
|
23669f5aa1
|
add some error handling to utility scripts
|
2012-08-04 17:56:32 -04:00 |
|
ichuang
|
7fe75030cc
|
fix staff edit link in module content display (goes to github)
|
2012-08-04 17:52:14 -04:00 |
|
ichuang
|
85af1d88cf
|
utility scripts to create new users, and staff_* groups for courses
|
2012-08-04 15:30:36 -04:00 |
|
ichuang
|
b8ae026c29
|
fail gracefully if course.xml missing metadata in course_staff_group_name
|
2012-08-04 11:16:47 -04:00 |
|
ichuang
|
d50af5765e
|
make university profile pages also use get_courses_by_university
|
2012-08-04 11:03:54 -04:00 |
|
ichuang
|
fb7b48e10a
|
minor - have migrate also show user when debugging
|
2012-08-04 10:28:05 -04:00 |
|
ichuang
|
3f83904c12
|
if AUTH_REQUIRE_STAFF_FOR_COURSE then course list = those accessible
|
2012-08-04 10:19:54 -04:00 |
|
ichuang
|
c20ebd13c4
|
in course_about.html make "You are registered..." a link to course
|
2012-08-04 08:22:06 -04:00 |
|
ichuang
|
9de6e28180
|
limit course reload to localhost or user.is_staff
|
2012-08-03 22:52:48 -04:00 |
|
ichuang
|
10f53d62e3
|
migration views - see modulestore contents, and force reload of course
|
2012-08-03 22:38:33 -04:00 |
|
ichuang
|
30922fb449
|
add ACCESS_REQUIRE_STAFF_FOR_COURSE feature for enrollment check
|
2012-08-03 21:39:23 -04:00 |
|
ichuang
|
f1ba26b007
|
require login and enrollment in course to be able to view its courseware
|
2012-08-03 20:36:17 -04:00 |
|
ichuang
|
84ed806f0d
|
start on lms migration path: view for loaded modules, and reload method
|
2012-08-03 20:20:35 -04:00 |
|
Bridger Maxwell
|
6d650d1825
|
Got the gradebook working again with the new fast grading method.
|
2012-08-03 17:55:25 -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 |
|