Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

1401 Commits

Author SHA1 Message Date
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
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
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
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
Calen Pennington
24f85bf202 Merge pull request #340 from MITx/kimth/lms-coderesponse 
Kimth/lms coderesponse
 2012-08-06 12:17:15 -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
3484f5382c isinstance instead of type 2012-08-06 14:10:00 -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
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
7f5246f653 Removed test view for grading. 2012-08-06 10:17:53 -04:00
ichuang
7607444286 fix bug: course staff group based on dir_name, not course number 2012-08-05 23:26:31 -04:00
Rocky Duan
7c58fd27a1 Merge branch 'master' of github.com:MITx/mitx 
Conflicts:
	lms/templates/profile.html
 2012-08-04 18:07:27 -04:00
ichuang
7fe75030cc fix staff edit link in module content display (goes to github) 2012-08-04 17:52:14 -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
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
f1ba26b007 require login and enrollment in course to be able to view its courseware 2012-08-03 20:36:17 -04:00
Bridger Maxwell
6d650d1825 Got the gradebook working again with the new fast grading method. 2012-08-03 17:55:25 -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
kimth
c25eded4fc Move xqueue_interface to lib/capa 2012-08-03 15:32:02 -04:00
kimth
af22761778 modx_dispatch doesn't need xqueue_interface 2012-08-03 15:27:39 -04:00
Victor Shnayder
94e24c1626 Leftover name->url_name fixes 2012-08-03 14:45:43 -04:00
Bridger Maxwell
854508b006 Removed the unnecessary creation of StudentModules when calling module_render's get_module. 2012-08-03 14:30:45 -04:00
kimth
7a9489a9b8 modx_dispatch combines file and non-file submission into single answer dict 2012-08-03 13:53:31 -04:00
Victor Shnayder
0b2069c619 make clean_xml script work with stringified errors 2012-08-03 11:53:35 -04:00
kimth
1be3057d3c xqueue interface in LMS not responsible for S3 upload 2012-08-03 11:49:20 -04:00
Bridger Maxwell
408e988fbc Started working on fast_grade method. It skips loading sections that a student doesn't have any answers for. 2012-08-03 11:41:06 -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
Rocky Duan
7ab137328f Merge branch 'master' of github.com:MITx/mitx into discussion2 2012-08-03 10:16:35 -04:00
kimth
f023dc6e26 xqueue_interface generates hashkeys 2012-08-03 10:10:06 -04:00
kimth
fbed664d4f Auth saved as dict rather than tuple 2012-08-03 09:39:18 -04:00
kimth
3d8ee671b3 Adjust comments 2012-08-03 09:34:47 -04:00
kimth
843f8ae9c3 Basic uploads to S3 2012-08-02 21:51:36 -04:00
kimth
3b3482b394 Skeleton for S3 upload by LMS 2012-08-02 20:43:09 -04:00
kimth
35a461d917 Empty file inputs insert empty string as their submission in ajax; LMS reacts accordingly 2012-08-02 20:22:33 -04:00
kimth
ea36eef6e0 modx_dispatch uses copied variable rather than source 2012-08-02 19:38:33 -04:00
kimth
236c3dc576 modx_dispatch handles new/old problem_check ajax 2012-08-02 19:34:33 -04:00
kimth
988136c401 LMS must login before submitting to xqueue 2012-08-02 18:34:14 -04:00
kimth
d2db4134cd CodeResponse does basic error handling from xqueue submission 2012-08-02 17:28:12 -04:00
kimth
6de2fa5e1e LMS interface to xqueue in separate file 2012-08-02 17:10:35 -04:00
kimth
541f5ecdd2 Filesubmission frontend 2012-08-02 14:32:40 -04:00
Victor Shnayder
987b9c11a9 Use url_name for chapters and sections in lms views 
* got rid of the hackish conversions between ' ' and '_'
* use url_name and display_name where appropriate
* update templates to match.
 2012-08-02 14:28:44 -04:00
Victor Shnayder
64346d727b todos and comments 2012-08-02 11:33:53 -04:00