Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,898 Commits 1 Branch 0 Tags
3222e083eb94cdacad8142ad1c19e3d1aa71d4e3
Commit Graph

1326 Commits

Author SHA1 Message Date
Diana Huang
120aa3cd3b Merge pull request #1421 from MITx/feature/vik/peer-grading-xmodule 
Feature/vik/peer grading xmodule
 2013-02-05 12:55:48 -08: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
David Ormsbee
74c112e5cc Merge pull request #1373 from MITx/feature/zoldak/django-comment-client-tests 
Add unit tests for django comment client
 2013-02-05 10:37:18 -08:00
Vik Paruchuri
7984c4dfcb Move over grading service to xmodule 2013-02-05 13:10:56 -05:00
Calen Pennington
4d8165b2b6 Remove bad import of replace_urls 2013-02-05 11:06:46 -05:00
Calen Pennington
401f564e6a Fix data directory passed to replace_static_urls 2013-02-05 11:06:46 -05:00
Calen Pennington
04879a83d3 Rejigger how /course and /static urls are replaced, to make the logic slightly more comprehensible 2013-02-05 11:06:45 -05:00
Calen Pennington
b05ead864f Revert "Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic"" 
This reverts commit c4f56620df.
 2013-02-05 11:06:45 -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
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
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
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
ichuang
19051e40d2 use ajax for doing conditional_module 2013-02-03 18:53:51 -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
b22bad7fa1 Add in some removed imports (fix tests) 2013-01-31 17:11:44 -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
Jay Zoldak
6fe209b0cf Merge pull request #1392 from MITx/tests/diana/update-oe-unit-tests 
New tests for OpenEndedGrading
 2013-01-31 08:34:06 -08: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
Calen Pennington
c4f56620df Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic" 
This reverts commit ab437b9463, reversing
changes made to 7a8e87c789.
 2013-01-30 16:49:49 -05:00
Diana Huang
36d8b8768c Merge branch 'master' into tests/diana/update-oe-unit-tests 2013-01-30 16:41:18 -05:00
Victor Shnayder
f2944334ab Merge pull request #1387 from MITx/feature/zoldak/courseware-unit-tests 
Add unit tests for lms courseware access
 2013-01-30 12:51:50 -08:00
Calen Pennington
ab437b9463 Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic 
Don't run collectstatic on course content
 2013-01-30 12:07:47 -08:00
Jay Zoldak
91b8a95ed7 Add unit tests for lms courseware access 2013-01-30 15:03:43 -05:00
chrisndodge
67775fbfa9 Merge pull request #1377 from MITx/feature/christina/misc 
Bug fixes for problem progress not updating.
 2013-01-30 08:24:38 -08:00