Don Mitchell
26e55f34a4
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-11 09:39:25 -05:00
cahrens
882eed4f89
Saving work.
2013-01-11 09:39:07 -05:00
Christina Roberts
5e28e59817
Merge pull request #1262 from MITx/feature/cas/speed-editor
...
explanation markdown
2013-01-11 06:37:26 -08:00
Don Mitchell
d53ca05d6c
Placeholder images for cheat sheet
2013-01-11 09:37:08 -05:00
Don Mitchell
e095a139b9
Cheat sheet updated for header and explanation. Video removed.
2013-01-11 09:36:29 -05:00
Diana Huang
5a211f566d
Make the rubric smaller so that we can accomodate more columns.
2013-01-11 09:31:38 -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
Vik Paruchuri
134c3f3db0
Document open ended descriptor
2013-01-10 19:00:03 -05:00
Vik Paruchuri
2f841c8a33
Document combined open ended module
2013-01-10 19:00:03 -05:00
Vik Paruchuri
38a81b461f
Remove open ended grading stuff, fix JS variable
2013-01-10 19:00:03 -05:00
Vik Paruchuri
bc97a507e0
Next step logic
2013-01-10 19:00:03 -05:00
Vik Paruchuri
adcbfbb603
Fix reset
2013-01-10 19:00:03 -05:00
Vik Paruchuri
b13f94798f
Add in allow reset action
2013-01-10 19:00:03 -05:00
Vik Paruchuri
1ae94ce636
Hopefully allow for submission to be reset early
2013-01-10 19:00:03 -05:00
Vik Paruchuri
b6a49f33ad
parse out min and max score to advance
2013-01-10 19:00:03 -05:00
Vik Paruchuri
dcb33f1d5f
Fix prompt and rubric passing
2013-01-10 19:00:03 -05:00
Vik Paruchuri
3aa0daaa76
Add in proper prompt and rubric parsing
2013-01-10 19:00:03 -05:00
Vik Paruchuri
9e14e22c91
Move prompt and rubric to combined open ended instead of defining them in each task
2013-01-10 19:00:03 -05:00
Vik Paruchuri
3bf532e199
Check marks in each step
2013-01-10 19:00:03 -05:00
Vik Paruchuri
5150d6cdee
Add in better status indicators
2013-01-10 19:00:03 -05:00
Vik Paruchuri
bccafe6c31
Add in correctness display
2013-01-10 19:00:02 -05:00
Vik Paruchuri
af705ca1af
Remove html
2013-01-10 19:00:02 -05:00
Vik Paruchuri
7b08114805
More restyling, fix buttons
2013-01-10 19:00:02 -05:00