Commit Graph

12296 Commits

Author SHA1 Message Date
David Ormsbee
f4138cae70 re-enable ENABLE_LMS_MIGRATION in dev, fix the course check filter to use ACCESS_REQUIRE_STAFF_FOR_COURSE 2012-08-07 15:01:12 -04:00
Bridger Maxwell
735488fa51 Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading 2012-08-07 14:40:37 -04:00
Bridger Maxwell
638a5059da Added stores_state attribute for xmoduledescriptors as a way to declare if the module stores state in the database. 2012-08-07 14:34:05 -04:00
kimth
a9a19f40c3 Merge master 2012-08-07 11:51:44 -04:00
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
Rocky Duan
547114a823 Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation 2012-08-07 11:31:26 -04:00
Rocky Duan
0c311b8f13 search for similar posts without any styling.. 2012-08-07 11:22:41 -04:00
Victor Shnayder
932a9be747 Make tests pass again
* test enrolls in course before testing pages
* support github edit links with new file structure
* Some pep8 cleanups
2012-08-07 11:06:47 -04:00
Bridger Maxwell
3a52e86a87 Fixed weighting of individual problems. Unmodified problems have weight None, not 1. 2012-08-07 08:00:06 -04:00
Rocky Duan
77900bd761 simple blank slate 2012-08-06 23:17:38 -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
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
Mike Chen
d9ffca2a31 vote_for_comment typo 2012-08-06 18:41:37 -04:00
Mike Chen
50228fc2d6 added permanent link for threads 2012-08-06 18:09:35 -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
Mike Chen
fca5ab9a08 added delete link 2012-08-06 16:01:41 -04:00
Mike Chen
7e8b1992f0 show endorsed checkmark based on permissions 2012-08-06 15:51:33 -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
Mike Chen
af656fcf21 use permissions to check if one can edit or relp 2012-08-06 15:08:47 -04: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
Mike Chen
3f1534eab7 added permission framework. 2012-08-06 12:58:20 -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
Mike Chen
30f5bdb429 fixed the order of decorators 2012-08-05 17:38:47 -04:00
Rocky Duan
20926e839b fixed ajax retrieved search bar in forum view 2012-08-05 14:57:35 -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
Rocky Duan
7cd0914541 minor changes 2012-08-04 16:06:15 -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
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
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
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