Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,993 Commits 1 Branch 0 Tags
718499d7933ed2684491c95e8a5d2dff203fdd22
Commit Graph

911 Commits

Author SHA1 Message Date
Bridger Maxwell
ec04b0cb13 Changed yield_module_descendents to be stack-based, so it plays nicer with the profiler. 2012-08-07 16:16:31 -04:00
Bridger Maxwell
a9d67c3e8d Added has_score attribute to xmodule, for problem-like xmodules. 2012-08-07 15:20:47 -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
thomasxiii
258b9eb530 Merge pull request #349 from MITx/feature/kfiedler/courseware-style 
A bunch of various fixes and de-styling
 2012-08-07 10:20:10 -07:00
Kyle Fiedler
dd6ec19e80 Make the modal window work in the courseware 2012-08-07 11:59:49 -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
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
ichuang
462d75936a Merge pull request #357 from MITx/hotfix-registration 
fix typo in registration button jquery
 2012-08-07 07:11:53 -07:00
ichuang
4b2091b173 fix typo in registration button jquery 2012-08-07 10:09:55 -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
Bridger Maxwell
3dffcaca1c Fixed capitalization in gradebook css. 2012-08-07 08:42:08 -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
ichuang
fa8bf7f371 make the staff debug information appear in a show/hide span 2012-08-06 21:54:29 -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
Kyle Fiedler
e90103abdf Reset styles for profile page and some for the info page 2012-08-06 16:08:41 -04:00
Kyle Fiedler
ac960ab9df Add images for book and fix styles for wiki 2012-08-06 16:08:40 -04:00
Kyle Fiedler
a090d62339 Add styles for next last page in textbook 2012-08-06 16:08:40 -04:00
Kyle Fiedler
e40c6b3812 Reset some styles for the textbook 2012-08-06 16:08:40 -04:00
Kyle Fiedler
29b8577346 Fix styles in the handouts sidebar 2012-08-06 16:08:40 -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
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
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
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
ichuang
7607444286 fix bug: course staff group based on dir_name, not course number 2012-08-05 23:26:31 -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
c42960c172 add feature ENABLE_SQL_TRACKING_LOGS and url view /event_logs 2012-08-05 16:32:58 -04:00
ichuang
9db88b0b52 fix comment in dev.py 2012-08-04 21:13:43 -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
fb7b48e10a minor - have migrate also show user when debugging 2012-08-04 10:28:05 -04:00