Commit Graph

9300 Commits

Author SHA1 Message Date
Vik Paruchuri
59ba308354 Add in peer grading entry point 2013-01-31 18:28:15 -05:00
Vik Paruchuri
bdb82cda65 Strip out JS, old urls 2013-01-31 18:23:30 -05:00
Brian Talbot
f6cd4c75b8 lms - revising xmodule HTML display styles and overwriting some to retain old syllabus table styling 2013-01-31 18:15:20 -05:00
Vik Paruchuri
52f3e9daaf Start moving peer grading to xmodule 2013-01-31 18:05:57 -05:00
Vik Paruchuri
c5e80b9543 Fix open ended module tests 2013-01-31 17:34:33 -05:00
Vik Paruchuri
d6f8def733 Move over rubric parsing logic to rubric module 2013-01-31 17:18:32 -05:00
Vik Paruchuri
5eff483c76 Fix max score in combined xmodule tests 2013-01-31 17:08:13 -05:00
Vik Paruchuri
524047a11e Fix key error in open ended child 2013-01-31 17:06:37 -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
Don Mitchell
fbd9a126ba Merge pull request #1393 from MITx/fix/cdodge/export-static-tabs
add exporting of course info
2013-01-31 10:55:45 -08:00
Vik Paruchuri
f3f509da3b Fix input area styling 2013-01-31 12:45:48 -05:00
Victor Shnayder
6088a926cc Add showanswer="past_due" and tests 2013-01-31 12:34:43 -05:00
Victor Shnayder
ea091a6eb8 Add tests for showanswer 2013-01-31 12:34:42 -05:00
Victor Shnayder
025b074b87 Add simple test for showanswer, fix test_system 2013-01-31 12:34:42 -05:00
Victor Shnayder
e41172d55d Add start of test framework for capa 2013-01-31 12:34:41 -05:00
Vik Paruchuri
a61746609c Fix keyerror 2013-01-31 12:18:42 -05:00
Victor Shnayder
e0fb906c06 add note about potential bug in verticals. No time to investigate at the moment... 2013-01-31 12:14:20 -05:00
Victor Shnayder
e431378f46 Add first pass at a randomize module 2013-01-31 12:14:01 -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
ee06afcb27 Possibly fix self assessment tests 2013-01-31 11:06:12 -05:00
Victor Shnayder
ada9ff7f27 Fix randomization bug in capa.
(Note: capa_problem was still doing randomization internally, but now it does what's actually intended)
2013-01-31 10:45:11 -05:00
Chris Dodge
0d20c192b9 add exporting of course info 2013-01-31 09:57:07 -05:00
Diana Huang
8144a1dfaf Add in next_problem jasmine tests 2013-01-30 17:25:13 -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
Vik Paruchuri
2ba194a4f6 Change step names to human names 2013-01-30 16:44:40 -05:00
Diana Huang
36d8b8768c Merge branch 'master' into tests/diana/update-oe-unit-tests 2013-01-30 16:41:18 -05:00
Diana Huang
6322263c90 New Jasmine tests 2013-01-30 16:40:55 -05:00
Vik Paruchuri
46101587b5 Add in some comments 2013-01-30 16:27:21 -05:00
Vik Paruchuri
afd42fc1dc Fix some image okay problems 2013-01-30 16:22:35 -05:00
Vik Paruchuri
f3572c7193 Fix image checking logic 2013-01-30 16:13:24 -05:00
Diana Huang
e873da76d5 Wrap reload to allow us to mock it. Add in some polling testing. 2013-01-30 16:01:28 -05:00
Vik Paruchuri
34bb0423d7 Reset default values 2013-01-30 15:57:10 -05:00
Vik Paruchuri
efe250f912 Fix logic, make better error messages 2013-01-30 15:55:33 -05:00
Vik Paruchuri
9fd36056d5 Fix some of the return logic, add better error messages 2013-01-30 15:51:06 -05:00
Vik Paruchuri
c6a81371e4 Add in some more docs 2013-01-30 15:37:48 -05:00
Vik Paruchuri
7911375603 Add in ability to submit an image URL 2013-01-30 15:31:28 -05:00
Vik Paruchuri
ac6f84ff2d Allow url submissions instead of images 2013-01-30 15:17:47 -05: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
Vik Paruchuri
99ecc784f0 Fix skin tone check 2013-01-30 14:53:27 -05:00
Vik Paruchuri
3389802d8d Fix logic in get_skin_ratio 2013-01-30 14:46:10 -05:00
Vik Paruchuri
da5ce144a9 Fix var names, remove debug statements 2013-01-30 14:42:56 -05:00
Vik Paruchuri
68c99192d2 Add some docstrings for image class 2013-01-30 14:40:29 -05:00
Vik Paruchuri
f729bf3bb6 Fix error message 2013-01-30 14:36:29 -05:00
Vik Paruchuri
1f221133d2 Remove skin tone check 2013-01-30 14:27:12 -05:00
Chris Dodge
cc09a90245 DRY things up a bit 2013-01-30 13:50:30 -05:00
Vik Paruchuri
ee4888b594 Address some review comments 2013-01-30 13:46:20 -05:00
Vik Paruchuri
8764c7fcb5 Fix exception handling/error messages 2013-01-30 13:41:13 -05:00
Vik Paruchuri
5fee1a49d0 Document image class, fix logging and scoring issues 2013-01-30 13:37:23 -05:00
Chris Dodge
c676046341 adding exporting of tabs and custom_tags. Also added unit tests 2013-01-30 13:25:17 -05:00
Vik Paruchuri
4840205554 Make CSS nicer 2013-01-30 13:00:03 -05:00