Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,618 Commits 1 Branch 0 Tags
ad261706c86fba19cf3ddf3311a21f28ddea135b
Commit Graph

7618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
ad261706c8 Merge pull request #1263 from MITx/feature/ichuang/instructor-dashboard-upgrade3 
Upgrade to instructor dashboard: enrollment, offline grades, remote gradebook
 2013-01-15 08:22:19 -08:00
Diana Huang
b067b0bf74 Merge pull request #1275 from MITx/feature/vik/integrate-sa-and-oe 
Clean up capa by removing message post actions that aren't needed
 2013-01-14 10:19:39 -08:00
Vik Paruchuri
ad1e73fa86 Clean up capa by removing message post actions that aren't needed 2013-01-14 13:12:38 -05:00
VikParuchuri
a64111a6e7 Merge pull request #1242 from MITx/feature/vik/integrate-sa-and-oe 
Feature/vik/integrate sa and oe
 2013-01-14 10:06:43 -08:00
Calen Pennington
19f79fa364 Prune deleted remote branches 2013-01-14 12:40:44 -05:00
Calen Pennington
0c00923a47 Merge pull request #1274 from MITx/fix/vik/staff-grading-settings 
Fix/vik/staff grading settings
 2013-01-14 09:36:19 -08:00
Vik Paruchuri
1316728aaa Minor naming fix 2013-01-14 12:32:31 -05:00
Vik Paruchuri
0e11deffcf Fix staff and peer grading settings to not fail catastrophically 2013-01-14 12:31:50 -05:00
Vik Paruchuri
a64806656a Integrate rubric into self assessment 2013-01-14 12:20:27 -05:00
Vik Paruchuri
16f06ae7b7 Fix some minor html 2013-01-14 11:57:09 -05:00
Vik Paruchuri
3e0cf9d234 Make rubric render more nicely 2013-01-14 11:53:23 -05:00
Vik Paruchuri
59e5b494a9 Proper rubric rendering for self assessment 2013-01-14 10:51:17 -05:00
Vik Paruchuri
2b4929562a Fix up rubric rendering 2013-01-14 10:39:58 -05:00
Vik Paruchuri
0567e8f0aa Factor out rubric rendering 2013-01-14 10:35:53 -05:00
Vik Paruchuri
c7339ee664 Minor bug fix 2013-01-14 10:16:57 -05:00
Vik Paruchuri
7d0bb7b3fe Minor string to boolean fix 2013-01-11 16:02:09 -05:00
Vik Paruchuri
682ac3455b Address some comments from code review, fix rubric display 2013-01-11 15:51:37 -05:00
Vik Paruchuri
9a752f51c7 Fix rubric return, add in score field 2013-01-11 12:48:15 -05:00
Vik Paruchuri
7febe2c2c8 Integrate minimal rubric display 2013-01-11 12:43:57 -05:00
Vik Paruchuri
52164f58ff Fix self.get call in peer grading service 2013-01-11 11:39:32 -05:00
Vik Paruchuri
1dca370a7f Better initial documentation of combined open ended 2013-01-11 09:50:43 -05:00
Vik Paruchuri
bcbf65e2b9 Code reformat, line length fix, change text names to variables 2013-01-11 09:45:10 -05:00
ichuang
4f869ad382 remove spurious comment 2013-01-11 00:10:52 -05:00
ichuang
b7ad39a0b9 instructor dashboard shouldn't import .grading anymore 2013-01-11 00:09:46 -05:00
ichuang
ed96046ad7 add documentation on remote gradebook xserver API 2013-01-10 23:59:20 -05:00
ichuang
37f848949d only is_staff users can add/edit/delete course instructors 2013-01-10 23:32:49 -05:00
ichuang
5cc88ec1ad example course_id for compute_grades management command 2013-01-10 23:32:48 -05:00
Calen Pennington
9853c6323f Remove circular dependencies that connect student.models and django_comment_client 
Includes removal of "from django_comment_client.models import Role" from common/djangoapps/student/models.py

Conflicts:

	common/djangoapps/student/models.py
 2013-01-10 23:32:48 -05:00
ichuang
ec94f7328c remove try...except workaround for circular import bug fixed by https://github.com/MITx/mitx/issues/1260 2013-01-10 23:32:48 -05:00
ichuang
e5c958082b list/add/delete instructors on instructor dashboard 2013-01-10 23:32:48 -05:00
ichuang
16b91cf732 remove spurious old migration file 2013-01-10 23:32:48 -05:00
ichuang
04d6f08c0c add offline grade computation & DB table for this 2013-01-10 23:32:48 -05:00
ichuang
82e31d533b Hookup CourseEnrollmentAllowed to lms/djangoapps/courseware/access.py 2013-01-10 23:31:46 -05:00
ichuang
97fb054449 add export grades to remote gradebook to instructor dashboard 2013-01-10 23:31:46 -05:00
ichuang
200493a54f instructor dashboard upgrade - add enrollment management 2013-01-10 23:31:45 -05:00
Vik Paruchuri
8dbbb021a7 Change value passing to hidden input type 2013-01-10 19:00:04 -05:00
Vik Paruchuri
c76786ae4e Roll back hidden input changes 2013-01-10 19:00:04 -05:00
Vik Paruchuri
ee2990da4f Change hidden div to input name 2013-01-10 19:00:04 -05:00
Vik Paruchuri
e4568c3a20 Use include clearfix in css 2013-01-10 19:00:04 -05:00
Vik Paruchuri
b0d3bcc516 Fix feedback response for peer grading so that students can respond to multiple feedback items 2013-01-10 19:00:04 -05:00
Vik Paruchuri
f4968e1e8e Fix spacing error 2013-01-10 19:00:04 -05:00
Vik Paruchuri
cb203a6f55 Better error messages 2013-01-10 19:00:04 -05:00
Vik Paruchuri
62e9387095 Fix score passing from controller 2013-01-10 19:00:04 -05:00
Vik Paruchuri
742d9475c7 Parse int from score 2013-01-10 19:00:04 -05:00
Vik Paruchuri
c4b1c8d074 Correct peer grading score parsing 2013-01-10 19:00:04 -05:00
Vik Paruchuri
c267efb400 Add in a comment 2013-01-10 19:00:03 -05:00
Vik Paruchuri
5a3a537c1b Support formatting of peer grading feedback 2013-01-10 19:00:03 -05:00
Vik Paruchuri
4a2875ccdd Document open ended child 2013-01-10 19:00:03 -05:00
Vik Paruchuri
f858dce753 Document self assessment 2013-01-10 19:00:03 -05:00
Vik Paruchuri
5303086a10 Start commenting open ended module 2013-01-10 19:00:03 -05:00