John Hess
|
fbce425152
|
drag and drop now correctly handles cases where no draggables should be dragged
|
2013-02-25 18:42:34 -05:00 |
|
Julian Arni
|
edba0978cf
|
Included styling and template
|
2013-02-25 18:18:46 -05:00 |
|
Julian Arni
|
0a47f27fa7
|
Merge branch 'master' into feature/jkarni/foldit-api
|
2013-02-25 17:32:30 -05:00 |
|
Julian Arni
|
26eaf8985c
|
Allow progress without leaderboard and vice-versa
|
2013-02-25 17:28:22 -05:00 |
|
Arthur Barrett
|
1f160d6ef4
|
added a box around the instructions text
|
2013-02-25 16:29:19 -05:00 |
|
Chris Dodge
|
816b0edfb0
|
add another command line argument to allow users to only simulate a delete (i.e. show what items would be deleted). This is a handy sanity checker.
|
2013-02-25 16:00:35 -05:00 |
|
Will Daly
|
8b5473b6f6
|
Wrote unit tests for NumericalResponse capa response type
|
2013-02-25 15:30:55 -05:00 |
|
Arthur Barrett
|
7b195eb0ee
|
fixed error if highlight not defined
|
2013-02-25 13:24:05 -05:00 |
|
Arthur Barrett
|
1721793e99
|
moved annotation return styling effect to css
|
2013-02-25 12:33:43 -05:00 |
|
Diana Huang
|
ae60661f94
|
Get previews to work in Studio and use the correct type of editors
for these XModules within Studio.
|
2013-02-25 11:42:06 -05:00 |
|
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 |
|
jmclaus
|
cfc8a37aae
|
Fully functional Genex
|
2013-02-24 12:02:06 -05: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
|
78bf8d5876
|
update annotationinput jsonv alue on tag selection or comment change
|
2013-02-22 00:42:12 -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 |
|