Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,969 Commits 1 Branch 0 Tags
6f147df7f7092932afc08519e2d2394be73295e6
Commit Graph

2393 Commits

Author SHA1 Message Date
Diana Huang
6f147df7f7 Merge branch 'master' into feature/diana/close-oe-problems 
Conflicts:
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-02-06 14:16:18 -05:00
Diana Huang
f42f84d9e8 Merge pull request #1440 from MITx/diana/rubric-ui-improvements 
Rubric UI updates
 2013-02-06 11:04:44 -08:00
Diana Huang
f3fa438018 Merge branch 'master' into feature/diana/close-oe-problems 
Conflicts:
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/timeparse.py
 2013-02-06 13:26:22 -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
Diana Huang
1f5beba383 Merge branch 'master' into diana/rubric-ui-improvements 2013-02-06 13:12:04 -05:00
Diana Huang
042ae2da29 Fix some bugs with the grading module and make 
the 'closed' page a little nicer
 2013-02-06 12:51:52 -05:00
Diana Huang
e8d01a0882 Merge branch 'master' into feature/diana/close-oe-problems 2013-02-06 11:52:40 -05:00
Diana Huang
78948210b8 Use different template when peer grading is closed. 2013-02-06 11:50:35 -05:00
Diana Huang
977e1904f9 Refactor out time parsing logic into its own class. 2013-02-06 11:25:06 -05:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Jay Zoldak
fde6d1ba1c Refactor tests for cms contentstore. 2013-02-06 10:42:21 -05:00
Jay Zoldak
2c5a7ccdf7 Rearrange factories and clean up imports 2013-02-06 10:36:28 -05:00
Diana Huang
40854fc1b4 Merge branch 'master' into feature/diana/close-oe-problems 2013-02-06 10:15:18 -05:00
Diana Huang
f9304a88cb Remove unneeded error type. 2013-02-06 09:15:24 -05:00
Diana Huang
6e7287dd8e Fix some bugs in the peer grading problem code. 2013-02-05 17:36:06 -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
Christina Roberts
8c4b661292 Merge pull request #1434 from MITx/bug/btalbot/studio-boldblockquote 
studio - resolved HTML display issue with bold and blockquote
 2013-02-05 13:13:44 -08:00
Diana Huang
a7588410b2 Fix tests 2013-02-05 16:11:04 -05:00
Diana Huang
31c89e6d03 Consolidate error messages. 2013-02-05 16:06:14 -05:00
Diana Huang
c70531ae27 Move closed check logic into the OpenEndedChild 2013-02-05 16:00:16 -05:00
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
Diana Huang
018412ca26 Return False to make this code clearer 2013-02-05 15:41:23 -05:00
Diana Huang
37900c3f76 Add more error logging for date parsing and make 
the closure checking more robust
 2013-02-05 15:37:20 -05:00
Brian Talbot
d713b288b5 studio - resolved HTML display issue where bold and blockquote elements didn't match LMSs style 2013-02-05 15:21:41 -05:00
Vik Paruchuri
ce87e6f221 Skip two tests 2013-02-05 14:57:59 -05:00
Vik Paruchuri
cae65706fd Pare down on peer grading service 2013-02-05 14:37:08 -05:00
Vik Paruchuri
8027cc7024 Fix some issues with tests 2013-02-05 14:35:44 -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
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
Don Mitchell
82b2dc7193 Merge pull request #1427 from MITx/feature/christina/misc2 
Do not do finds within the event method. Decreases likelihood of hitting...
 2013-02-05 07:19:40 -08:00
cahrens
286616e659 Do not do finds within the event method. Decreases likelihood of hitting bug in older versions of Chrome. 
https://edx.lighthouseapp.com/projects/102637/tickets/153
 2013-02-05 09:50:34 -05:00
Diana Huang
f3be02d772 Merge branch 'master' into diana/rubric-ui-improvements 2013-02-05 09:13:14 -05:00
Diana Huang
4bb4c458a8 Merge branch 'master' into feature/diana/close-oe-problems 2013-02-05 09:12:08 -05:00
Victor Shnayder
82afc477fa Merge pull request #1396 from MITx/feature/victor/randomization 
Feature/victor/randomization
 2013-02-04 15:37:07 -08:00
Victor Shnayder
b6614f6939 add initial test that only tests the descriptor 2013-02-04 18:28:22 -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
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
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
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