Ned Batchelder
|
aa2d0ecaf2
|
We no longer need override_settings, Django has a better one.
|
2013-02-11 17:06:35 -05:00 |
|
Calen Pennington
|
cfae1cdf62
|
Pep8 autofixes
|
2013-02-06 11:13:50 -05:00 |
|
Vik Paruchuri
|
0133c7c669
|
Patch peer grading tab to work
|
2013-02-05 16:32:40 -05:00 |
|
Vik Paruchuri
|
ce87e6f221
|
Skip two tests
|
2013-02-05 14:57:59 -05:00 |
|
Vik Paruchuri
|
8027cc7024
|
Fix some issues with tests
|
2013-02-05 14:35:44 -05:00 |
|
Vik Paruchuri
|
134f2f7af7
|
Fix tests, bugfix for problem url error
|
2013-02-05 14:21:08 -05:00 |
|
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
|
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
|
7f96fbb3d1
|
Address review comments
|
2013-02-04 17:15:07 -05:00 |
|
Vik Paruchuri
|
c4c674367f
|
Remove unneccesary imports
|
2013-02-04 16:54:36 -05:00 |
|
Vik Paruchuri
|
6cf2742e32
|
Trim unneeded files
|
2013-02-04 14:22:57 -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 |
|
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 |
|
Vik Paruchuri
|
f742b7d865
|
Start to integrate peer grading xmodule back into notifications
|
2013-02-04 12:07:03 -05:00 |
|
Vik Paruchuri
|
8bd7b60aca
|
Add in key to mock peer grading service
|
2013-02-04 10:50:07 -05:00 |
|
Vik Paruchuri
|
c991c0489c
|
Fix open ended test with flagging
|
2013-02-04 10:26:25 -05: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 |
|
Vik Paruchuri
|
01cdc6e7f8
|
Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes
Conflicts:
common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
|
2013-01-31 16:50:10 -05:00 |
|
Vik Paruchuri
|
78f9f63466
|
Add in notification type for flagged submissions
|
2013-01-31 11:19:15 -05:00 |
|
Vik Paruchuri
|
b4c80da224
|
Trim whitespace
|
2013-01-30 21:50:24 -05:00 |
|
Vik Paruchuri
|
8e9ec501a7
|
Implement flagging, fix urls
|
2013-01-30 21:44:21 -05:00 |
|
Vik Paruchuri
|
4c16479569
|
Working on frontend JS for posting
|
2013-01-30 21:22:59 -05:00 |
|
Vik Paruchuri
|
17fce100bb
|
Add in ban actions to table
|
2013-01-30 21:10:48 -05:00 |
|
Vik Paruchuri
|
b248a09572
|
Work on adding in ban actions
|
2013-01-30 21:06:54 -05:00 |
|
Vik Paruchuri
|
e89196e0dd
|
Add in flagged problem list return
|
2013-01-30 20:47:00 -05:00 |
|
Vik Paruchuri
|
dd72297f73
|
Wire up flagged problem list
|
2013-01-30 20:39:53 -05:00 |
|
Vik Paruchuri
|
78696c62b8
|
Work on open ended flagged problems
|
2013-01-30 20:36:09 -05:00 |
|
Vik Paruchuri
|
5f538f078b
|
Pass flag through from LMS to grading controller
|
2013-01-30 19:50:36 -05:00 |
|
Vik Paruchuri
|
b730c25056
|
Fix rubric rendering
|
2013-01-29 21:51:48 -05:00 |
|
Vik Paruchuri
|
6425a519fd
|
Fix notifications to work with cache (sync timings)
|
2013-01-29 21:24:04 -05:00 |
|
Diana Huang
|
d4ed059975
|
Do some better error checking for items.
|
2013-01-29 21:24:04 -05:00 |
|
Diana Huang
|
486753a263
|
Display alerts from notifications on the panel.
|
2013-01-29 21:24:03 -05:00 |
|
Diana Huang
|
9f19eafcf0
|
Update main notification dashboard with new styles.
|
2013-01-29 21:24:03 -05:00 |
|
Vik Paruchuri
|
665fb707b1
|
Cache notifications for 5 mins so that we don't hit the grading server on every web request
|
2013-01-29 21:24:03 -05:00 |
|
Vik Paruchuri
|
68f563a178
|
Fix naming issue
|
2013-01-29 21:24:03 -05:00 |
|
Vik Paruchuri
|
8b8c1dbe60
|
Fix query error
|
2013-01-29 21:24:03 -05:00 |
|
Vik Paruchuri
|
33003e65d4
|
Make things less noisy (remove debug statements)
|
2013-01-29 19:53:36 -05:00 |
|
Vik Paruchuri
|
0630f59c06
|
Pass proper parameters, fix templating
|
2013-01-29 19:52:50 -05:00 |
|
Vik Paruchuri
|
bb55792b2b
|
Make things less noisy (remove debug statements)
|
2013-01-29 19:31:03 -05:00 |
|
Vik Paruchuri
|
457afaaeda
|
Making tab render properly for open ended notifications
|
2013-01-29 19:31:03 -05:00 |
|
Vik Paruchuri
|
f47c431faf
|
Fix templating
|
2013-01-29 19:31:03 -05:00 |
|
Vik Paruchuri
|
8602e1595b
|
Pass proper parameters, fix templating
|
2013-01-29 19:31:03 -05:00 |
|