Diana Huang
f4addddf42
Merge pull request #1484 from MITx/feature/vik/improve-oe-ui
...
Feature/vik/improve oe ui
2013-02-19 07:27:29 -08:00
Diana Huang
3e23b9e1f2
Merge pull request #1480 from MITx/diana/staff-grading-flagging
...
Flag submissions from staff grading view
2013-02-15 13:08:16 -08:00
Victor Shnayder
4f8757600a
merge
2013-02-14 12:49:14 -05:00
Victor Shnayder
5e44846596
Foldit integration.
...
- ops view for the desktop app to talk to
- xmodule that talks to the foldit model and displays the student's state
- grading tweak to make grade updates from an external service work:
- Add an always_recalculate_grades property to XModuleDescriptor.
2013-02-14 12:45:06 -05:00
Ned Batchelder
d614c80cc2
Firefox doesn't draw the buttons right with -90deg, but will draw it right if no direction is specified.
2013-02-14 10:39:16 -05:00
Brian Talbot
f33f7134fb
lms - pearson: trying to resolve JQUI accordion width bug in IE7 - enforcing width to chapters
2013-02-12 10:34:21 -05:00
Brian Talbot
83e4dfaacb
lms - pearson: trying to resolve JQUI accordion width bug in IE7
2013-02-12 09:58:16 -05:00
Vik Paruchuri
58a2186e71
Increase padding a bit
2013-02-11 11:33:44 -05:00
Vik Paruchuri
4e071d086f
Fix staff grading ML error info a bit
2013-02-11 11:31:26 -05:00
Vik Paruchuri
920acffd2c
Resize student submission box
2013-02-11 11:13:34 -05:00
Vik Paruchuri
838d948c15
Fix padding and border on staff and peer grading panels
2013-02-11 11:07:20 -05:00
Diana Huang
d3d3a03c61
Add checkbox and make sure to uncheck it after submission
2013-02-11 09:23:55 -05:00
Diana Huang
f3bb429915
Get and pass the new submission flagged information through
...
the controller to the backend.
2013-02-11 09:23:55 -05:00
Vik Paruchuri
9fa16b07d6
Remove ability to manually get results
2013-02-07 18:02:48 -05:00
Brian Wilson
290368ef0d
merge out from master
2013-02-07 17:40:54 -05:00
Vik Paruchuri
9bf53026e6
Tweak box in peer and staff grading views
2013-02-07 14:18:38 -05:00
Vik Paruchuri
1cf8326b32
Make status bar, minor CSS fixes
2013-02-07 14:03:43 -05:00
Vik Paruchuri
5ef4af5afd
Fix peer and staff grading interfaces
2013-02-07 12:54:36 -05:00
Vik Paruchuri
ade44c330d
Make staff grading interface much nicer
2013-02-07 12:45:08 -05:00
Vik Paruchuri
baba8d3a36
Add collapse action into staff grading view
2013-02-07 12:42:05 -05:00
Vik Paruchuri
3457b86bd0
Fix JS, style student response box
2013-02-07 12:36:57 -05:00
Brian Talbot
6d4cb558d3
lms - pearson: styled return to exam link on timer and revised timer positioning to not interfere with main course nav
2013-02-07 12:35:52 -05:00
Vik Paruchuri
c195fe65cd
Restyle rubric list, submission container
2013-02-07 11:10:29 -05:00
Vik Paruchuri
6a6962df9e
Alter rubric list, restyle rubric
2013-02-07 09:26:27 -05:00
Victor Shnayder
2af06ef1d4
Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes"
...
This reverts commit 66889b87240dd9c24e74
2013-02-06 20:29:17 -05:00
Kevin Chugh
55c205b9b4
merged master
2013-02-06 17:13:52 -05:00
Vik Paruchuri
83608fd983
Restyle lists
2013-02-06 16:58:59 -05:00
Vik Paruchuri
28a0e44120
Quick rubric restyle
2013-02-06 16:57:10 -05:00
Vik Paruchuri
8bc98b2ff8
Fix sass
2013-02-06 16:32:16 -05:00
Vik Paruchuri
48719a7a45
Merge branch 'feature/vik/oe-versioning' into feature/vik/improve-oe-ui
...
Conflicts:
common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
lms/static/sass/course/_staff_grading.scss
2013-02-06 16:04:01 -05:00
Vik Paruchuri
9e4e98ef74
Fix some css to get things to properly close/open
2013-02-06 15:13:56 -05:00
Vik Paruchuri
02ac72d0af
Doing some restyling on peer grading
2013-02-06 13:49:59 -05:00
Diana Huang
4adf2f6180
Merge branch 'master' into diana/rubric-ui-improvements
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/combined_open_ended_rubric.py
2013-02-06 13:16:24 -05:00
Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
Diana Huang
51db547a63
Merge branch 'master' into diana/rubric-ui-improvements
...
Conflicts:
common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
2013-02-05 16:18:56 -05:00
Diana Huang
f3be02d772
Merge branch 'master' into diana/rubric-ui-improvements
2013-02-05 09:13:14 -05:00
Vik Paruchuri
bf97a6a9a9
Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule
...
Conflicts:
lms/djangoapps/open_ended_grading/peer_grading_service.py
2013-02-04 17:55:55 -05:00
Vik Paruchuri
e8803985f2
Fix JS on after event handling
2013-02-04 17:41:44 -05:00
Vik Paruchuri
d89ab000d2
Fix a function call
2013-02-04 17:30:45 -05:00
Vik Paruchuri
eb049bda9e
Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-flagging
2013-02-04 17:18:59 -05:00
Vik Paruchuri
7f96fbb3d1
Address review comments
2013-02-04 17:15:07 -05:00
Vik Paruchuri
83b7533a12
Fix CSS to fit all elements on the page
2013-02-04 16:49:32 -05:00
Brian Talbot
1923ae0d6b
pearson - added in timer styling for IE7
2013-02-04 15:40:01 -05:00
Vik Paruchuri
6cf2742e32
Trim unneeded files
2013-02-04 14:22:57 -05:00
Your Name
bdfc9d9784
Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes
2013-02-04 12:30:48 -05:00
Diana Huang
f49b5ec771
Merge branch 'master' into diana/rubric-ui-improvements
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_rubric.py
common/lib/xmodule/xmodule/self_assessment_module.py
lms/djangoapps/open_ended_grading/grading_service.py
lms/static/sass/course.scss
2013-02-04 09:11:28 -05:00
VikParuchuri
01fab2ec68
Merge pull request #1346 from MITx/feature/vik/combined-xmodule-changes
...
Feature/vik/combined xmodule changes
2013-02-01 15:46:33 -08:00
Vik Paruchuri
d9517877a4
Merge branch 'feature/vik/combined-xmodule-changes' into feature/vik/peer-grading-flagging
2013-02-01 18:32:48 -05:00
Brian Wilson
9d98b7055d
add course navigation back into timed exam. Add initial timer styling.
2013-02-01 17:52:14 -05:00
Diana Huang
a85d43a817
Make rubrics spacing smaller and
...
fix a bug in the grading service renderer
2013-02-01 15:15:42 -05:00
