Vik Paruchuri
|
e13de7543f
|
Test fixes, err response fixes, address review comments
|
2013-02-05 14:12:11 -05:00 |
|
Vik Paruchuri
|
34dc6e6320
|
Fix some issues with peer grading service
|
2013-02-05 13:37:55 -05:00 |
|
Vik Paruchuri
|
7984c4dfcb
|
Move over grading service to xmodule
|
2013-02-05 13:10:56 -05:00 |
|
Vik Paruchuri
|
e8a690df5e
|
Update peer grading tests
|
2013-02-05 10:46:00 -05:00 |
|
Vik Paruchuri
|
443c3eda4f
|
Tests for peer grading service may be fixed.
|
2013-02-04 18:37:28 -05:00 |
|
Vik Paruchuri
|
18814196f0
|
Make things slightly robust
|
2013-02-04 18:31:32 -05:00 |
|
Vik Paruchuri
|
725f0c632c
|
Remove get statements, fix module_render
|
2013-02-04 18:27:25 -05:00 |
|
Vik Paruchuri
|
009a8c5f63
|
Fix issue with passing rubric scores back to controller
|
2013-02-04 18:17:23 -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 |
|
Diana Huang
|
fb777de18d
|
Merge pull request #1401 from MITx/feature/vik/peer-grading-flagging
Feature/vik/peer grading flagging
|
2013-02-04 14:45:59 -08:00 |
|
Vik Paruchuri
|
1dab4aba96
|
Fix accidental commit of dev.py
|
2013-02-04 17:44:09 -05:00 |
|
Vik Paruchuri
|
e8803985f2
|
Fix JS on after event handling
|
2013-02-04 17:41:44 -05:00 |
|
David Ormsbee
|
4999a8e95f
|
Merge pull request #1419 from MITx/debug/dave/sass
Remove compressed flag from SASS call in pipeline so we can diff the gen...
|
2013-02-04 14:36:31 -08:00 |
|
David Ormsbee
|
9f634aba3c
|
Remove compressed flag from SASS call in pipeline so we can diff the generated CSS
|
2013-02-04 17:33:26 -05:00 |
|
Vik Paruchuri
|
d89ab000d2
|
Fix a function call
|
2013-02-04 17:30:45 -05:00 |
|
Vik Paruchuri
|
f019225d16
|
Fix reloading
|
2013-02-04 17:23:34 -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 |
|
Victor Shnayder
|
d7570de5d7
|
Merge pull request #1418 from MITx/feature/ichuang/conditional-xmodule-fix-display
fix bug in conditional - videos were not playing, because a js function changed syntax
|
2013-02-04 14:14:18 -08:00 |
|
ichuang
|
0c07f03d68
|
XModule.loadModules only takes @el as argument now
|
2013-02-04 17:04:39 -05:00 |
|
Vik Paruchuri
|
5d8aade8e7
|
Explain django settings imports
|
2013-02-04 16:57:09 -05:00 |
|
Vik Paruchuri
|
c4c674367f
|
Remove unneccesary imports
|
2013-02-04 16:54:36 -05:00 |
|
Vik Paruchuri
|
83b7533a12
|
Fix CSS to fit all elements on the page
|
2013-02-04 16:49:32 -05:00 |
|
Vik Paruchuri
|
cbd0895aad
|
Add in single peer grading problem view
|
2013-02-04 16:42:14 -05:00 |
|
Vik Paruchuri
|
c9f75f8b3c
|
Add in score return
|
2013-02-04 16:14:34 -05:00 |
|
Christina Roberts
|
2306e7c1e8
|
Merge pull request #1417 from MITx/feature/christina/misc2
Try, try again.
|
2013-02-04 12:56:26 -08:00 |
|
Christina Roberts
|
43c2acdb1f
|
Merge pull request #1416 from MITx/feature/dhm/dnd
Brian's CSS updates.
|
2013-02-04 12:50:36 -08:00 |
|
cahrens
|
aac179f135
|
Try, try again.
|
2013-02-04 15:48:05 -05:00 |
|
Sarina
|
25bede9005
|
Merge pull request #1414 from MITx/feature/victor/showanswer-past-due
Feature/victor/showanswer past due
|
2013-02-04 12:39:13 -08:00 |
|
Victor Shnayder
|
fe42d8e9a8
|
fix typo, add comment
|
2013-02-04 15:04:20 -05:00 |
|
Vik Paruchuri
|
af6123a1ac
|
Add in methods to query data from the controller for student grading
|
2013-02-04 15:00:07 -05:00 |
|
Vik Paruchuri
|
4c5e59e84a
|
Start to fix up instance states
|
2013-02-04 14:52:41 -05:00 |
|
Brian Talbot
|
ffd585ae56
|
studio - resolved safari/webkit display issue with unit editing window's wrapper background color
|
2013-02-04 14:44:17 -05:00 |
|
Brian Talbot
|
6ca55b8458
|
studio - overview drag and drop: removed unused scss and hid new unit button while dragging
|
2013-02-04 14:35:04 -05:00 |
|
Vik Paruchuri
|
ed282c05d4
|
Proper handling of submissions
|
2013-02-04 14:33:46 -05:00 |
|
Vik Paruchuri
|
6cf2742e32
|
Trim unneeded files
|
2013-02-04 14:22:57 -05:00 |
|
Vik Paruchuri
|
81b86bb8fe
|
Retrack dev
|
2013-02-04 14:16:26 -05:00 |
|
Vik Paruchuri
|
43ddf1fbcf
|
Proper redirect behavior
|
2013-02-04 14:14:15 -05:00 |
|
Vik Paruchuri
|
14676d1c32
|
Untrack dev.py, add in redirect code for peer grading
|
2013-02-04 14:05:02 -05:00 |
|
Vik Paruchuri
|
3380745692
|
About to trim some lines
|
2013-02-04 13:54:27 -05:00 |
|
Christina Roberts
|
517f756ffa
|
Merge pull request #1413 from MITx/feature/christina/misc2
See if this helps with the tab-changing race condition.
|
2013-02-04 10:34:37 -08:00 |
|
cahrens
|
39479d9e18
|
See if this helps with the tab-changing race condition.
|
2013-02-04 13:28:34 -05:00 |
|
Vik Paruchuri
|
c6c89e4216
|
Make peer grading xmodule work with notifications
|
2013-02-04 13:16:05 -05:00 |
|
Vik Paruchuri
|
7263cbfcca
|
Fixes to make peer grading show up in notifications
|
2013-02-04 12:41:14 -05:00 |
|
Christina Roberts
|
be5dd6d25a
|
Merge pull request #1411 from MITx/feature/dhm/dnd
Attempt to patch the dnd hesitation fixes onto master
|
2013-02-04 09:29:07 -08:00 |
|
Victor Shnayder
|
486e747b18
|
Merge pull request #1407 from MITx/feature/ichuang/conditional-xmodule-v2
Provides "stop" feature via a new "conditional" XModule
|
2013-02-04 09:20:07 -08:00 |
|
Vik Paruchuri
|
f742b7d865
|
Start to integrate peer grading xmodule back into notifications
|
2013-02-04 12:07:03 -05:00 |
|
jarv
|
723f47f4cc
|
Merge pull request #1412 from MITx/feature/jarv/service-variant-default
Defaulting service_variant to a blank string
|
2013-02-04 09:06:24 -08:00 |
|
Don Mitchell
|
902cdefefa
|
Added comments for unused 2nd arg on generateCheckHoverState
|
2013-02-04 12:05:49 -05:00 |
|
John Jarvis
|
7c39e38539
|
Defaulting service_variant to a blank string
|
2013-02-04 12:05:45 -05:00 |
|