Commit Graph

14212 Commits

Author SHA1 Message Date
David Ormsbee
76320b0e19 Add slightly revised course XML tutorial 2013-02-26 02:22:59 -05:00
Brian Wilson
fc9ab346e1 fix loading of specific pages. 2013-02-26 01:03:01 -05:00
Julian Arni
414c62115c Fixed tests and list check 2013-02-25 20:12:33 -05:00
Victor Shnayder
ab3eb99b6f Merge pull request #1552 from MITx/jth/fix_draganddrop
Jth/fix draganddrop
2013-02-25 16:29:50 -08:00
John Hess
ac7fe0631a fixed excess_draggable behavior so that true means it is actually excess 2013-02-25 19:20:37 -05:00
Julian Arni
b4387b287d Adding migrations 2013-02-25 18:56:58 -05:00
Victor Shnayder
9fb1c0b284 Merge pull request #1553 from MITx/fix/will/symbolic_response_does_not_accept_zero
Fixed an error in symmath_check
2013-02-25 15:50:33 -08:00
John Hess
d265c255ec Merge branch 'master' of github.com:MITx/mitx 2013-02-25 18:42:39 -05:00
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
3473a5d3b0 Fixed broken reference 2013-02-25 18:39:59 -05:00
Will Daly
850d9846f8 Fixed an error in symmath_check that occurred when
the expected result = 0.  symmath_check() was dividing
a quantity by the expected result, leading to a NaN value
that caused the answer to be marked incorrect.

Added test_symmath_check.py with basic tests for
the symmath_check() function.
2013-02-25 18:34:35 -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
David Ormsbee
a2a536b5ed Add docs sketching data formats. 2013-02-25 17:03:59 -05:00
Brian Wilson
dde2cd0bd0 get chapter links to start working 2013-02-25 16:52:32 -05:00
Brian Talbot
95ea01689f studio - alerts: firmed up status-based notifications 2013-02-25 16:30:36 -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
Brian Talbot
d809df913d studio - alerts: moved all states and documentation into new /alerts view 2013-02-25 14:45:27 -05:00
Brian Talbot
8179b9fadc studio - alerts: initial pass at alert styling and markup complete 2013-02-25 14:19:22 -05:00
chrisndodge
ae681a52f9 Merge pull request #1549 from MITx/bug/dhm/video
Somehow the saves changed to just sets w/ don't send data to the server.
2013-02-25 10:30:47 -08: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
Don Mitchell
bb0ad61f81 Somehow the saves changed to just sets w/ don't send data to the server. 2013-02-25 12:13:50 -05:00
David Ormsbee
f519c4f571 Merge pull request #1474 from MITx/feature/victor/revert-revert-of-forums-ui
Feature/victor/revert revert of forums ui
2013-02-25 09:03:33 -08:00
Victor Shnayder
fe47d96969 Merge pull request #1547 from MITx/fix/will/cs191_symmath_check_ans=0_bug
Fixed a bug in symmath_check():
2013-02-25 08:48:23 -08: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
Will Daly
862ce67bfc Fixed a bug in symmath_check(): one of the if statements
evaluated bool(ans), which is False when ans=0.
This led to an error message "[symmath_check] failed to get MathML for
input; dynamath=[None]" when the function reached a later condition.
The check that evaluated  bool(ans) was redundant, so I removed it.
2013-02-25 10:59:33 -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
David Ormsbee
3a0c1eaa71 Merge pull request #1545 from MITx/feature/victor/dynamic-cohorts
Feature/victor/dynamic cohorts
2013-02-25 07:26:25 -08:00
Vasyl Nakvasiuk
aa34c9d335 remove 'passed' feature 2013-02-25 16:56:34 +02:00
Your Name
9f58f6890d Merge branch 'master' into feature/victor/revert-revert-of-forums-ui 2013-02-25 09:31:28 -05: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