Diana Huang
f161bdd0a2
Fix studio import and export for CombinedOpenEnded and PeerGrading XModules
...
Also, fix a bug in the peer grading.
2013-02-25 11:42:06 -05:00
Vasyl Nakvasiuk
2348ed3db1
fix empty display_name problem
2013-02-25 18:38:47 +02:00
Arthur Barrett
e736ed34f5
added ability to hide/show instructions, if present
2013-02-25 11:29:59 -05:00
David Ormsbee
dde4fc981b
Merge pull request #1546 from MITx/fix/cdodge/make-jump-to-handle-lost-slash
...
add a 'missing slash' regular expression for Location patterns in order ...
2013-02-25 08:22:24 -08:00
Julian Arni
da2d0ed6ec
Foldit with puzzle leaderboard
2013-02-25 11:16:37 -05:00
Chris Dodge
752ff20cf5
add a 'missing slash' regular expression for Location patterns in order to account for dropped slash with the i4x:// pattern. Certain redirect cases will cause this 2nd slash to be dropped (I think via Nginx)
2013-02-25 10:45:00 -05:00
Vasyl Nakvasiuk
aa34c9d335
remove 'passed' feature
2013-02-25 16:56:34 +02:00
Vasyl Nakvasiuk
a70cb2e154
Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged
2013-02-25 16:20:01 +02:00
Vasyl Nakvasiuk
0448ef5e03
add docstring
2013-02-25 16:15:33 +02:00
Valera Rozuvan
65bbfab566
Changed text on reset button.
2013-02-25 16:02:26 +02:00
Alexander Kryklia
fbc8d0e9d7
renamed
2013-02-25 14:11:26 +02:00
Alexander Kryklia
ebc37f1d2d
reset updates
2013-02-25 13:35:58 +02:00
Valera Rozuvan
767f0bd4b3
Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged
2013-02-25 13:28:27 +02:00
Valera Rozuvan
1ca397c5eb
Testing errors.
2013-02-25 13:28:19 +02:00
Alexander Kryklia
4600155f97
add icon class support
2013-02-25 13:13:00 +02:00
Valera Rozuvan
df2335c90c
Bug fixing.
2013-02-25 13:08:37 +02:00
Valera Rozuvan
6f16455e70
Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged
2013-02-25 12:57:31 +02:00
Alexander Kryklia
0f7db9e54d
Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged
2013-02-25 12:55:58 +02:00
Valera Rozuvan
5a62eae726
Fixing bugs.
2013-02-25 12:55:29 +02:00
Alexander Kryklia
f5dc0afa07
fixed reset json
2013-02-25 12:54:56 +02:00
Valera Rozuvan
653154f11e
UI changes.
2013-02-25 12:33:49 +02:00
Valera Rozuvan
d9ad4b5724
Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged
2013-02-25 12:13:52 +02:00
Valera Rozuvan
268e5b4bf7
Front end stuff clean up.
2013-02-25 12:13:44 +02:00
Alexander Kryklia
82a74abd65
return ok on poll_reset
2013-02-25 12:12:28 +02:00
Alexander Kryklia
9cdd271ee4
added icon class
2013-02-25 12:04:18 +02:00
Alexander Kryklia
3dae4d29bd
reset part-1
2013-02-25 11:21:47 +02:00
Victor Shnayder
01a38c29be
Add auto-cohorting functionality.
...
See changes in xml-format.md or wiki (dynamic cohorts v1) for spec.
2013-02-24 18:48:01 -05:00
Victor Shnayder
8e93e0770f
Merge pull request #1509 from MITx/feature/victor/capa-finished
...
Add showanswer="finished" option and tests
2013-02-24 13:24:34 -08:00
Arthur Barrett
c3f55845c0
factoring out discussion logic (for now, anyway)
2013-02-22 18:22:32 -05:00
Arthur Barrett
66ddfa295d
more refactoring and work on annotationinput (should be working now).
2013-02-22 16:33:28 -05:00
Arthur Barrett
840f7839fa
added save and render functionality to annotationinput
2013-02-22 12:48:22 -05:00
Julian Arni
e5294591dc
Foldit leaderboard w/o tests
2013-02-22 11:12:26 -05:00
Vik Paruchuri
d5865e70b8
Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages
2013-02-22 10:21:34 -05:00
Diana Huang
f9667849b8
Fix some minor bugs in event handling and add enter key support
2013-02-22 09:47:50 -05:00
Diana Huang
3ecafa9b42
Add hot keys to rubrics
2013-02-22 09:47:50 -05:00
Arthur Barrett
3970ea33e1
return from capa problem
2013-02-21 22:54:50 -05:00
Arthur Barrett
0e2c46a718
Clicking "reply to annotation" scrolls to the problem (specified in xml by problem=index).
2013-02-21 17:01:43 -05:00
Brian Wilson
d503fe3d79
Merge remote-tracking branch 'origin/master' into feature/brian/pdf_js
2013-02-21 15:38:28 -05:00
Victor Shnayder
8d76556729
Merge pull request #1531 from MITx/fix/cdodge/serializing-ints-as-empty-strings
...
Fix/cdodge/serializing ints as empty strings
2013-02-21 12:12:44 -08:00
Diana Huang
76c4007449
Merge pull request #1522 from MITx/diana/click-tracking
...
Add more click tracking and logging to the open ended grading interface
2013-02-21 11:10:35 -08:00
Arthur Barrett
a8178de497
Added styling to the annotationinput capa problem.
2013-02-21 13:52:22 -05:00
Chris Dodge
bb75a23101
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/serializing-ints-as-empty-strings
2013-02-21 11:58:52 -05:00
David Ormsbee
3494d58450
Merge pull request #1532 from MITx/feature/ned/clean_up_tests
...
Make sure temp directories are properly cleaned up so running tests does...
2013-02-21 08:52:09 -08:00
Ned Batchelder
c3b571bf9b
Make sure temp directories are properly cleaned up so running tests doesn't leave them behind.
2013-02-21 11:38:45 -05:00
Don Mitchell
ba7959fc4d
Merge pull request #1511 from MITx/feature/cdodge/metadata-inheritence-crawling
...
Feature/cdodge/metadata inheritence crawling
2013-02-21 08:29:54 -08:00
Chris Dodge
68a8587ed2
don't serialize weight out as an int - use a string. The code in capa-module.py expects a string and tries to convert to a float. So this impedence mismatch is causing a crash on import when importing empty strings for 'weight' or 'attempts'
2013-02-21 11:02:47 -05:00
Diana Huang
9aac915c9f
Remove unnecessary assignment
2013-02-21 10:33:48 -05:00
Diana Huang
3a8b7156a0
Merge branch 'master' into diana/click-tracking
2013-02-21 10:19:35 -05:00
Diana Huang
18a56005b0
Address code review feedback
...
- make category a data field of an input
- namespace event types
- don't try to use the track function when it doesn't exist
- generate event types if it doesn't match a pre-existing pattern
2013-02-21 10:17:08 -05:00
Vik Paruchuri
9d5a08fc6d
Fix location string
2013-02-20 18:07:24 -05:00
