Brian Talbot
cb456ad228
studio - alerts: converted transition-based animation to keyframe/css animation and added in a demo for a fleeting notification
2013-02-27 12:45:44 -05:00
Brian Talbot
cc02b4714c
Merge branch 'master' into feature/btalbot/studio-alerts
2013-02-26 14:22:50 -05:00
Brian Talbot
d09927e8dd
studio - alerts: small styling tweaks for the close button on help notifications
2013-02-26 12:38:46 -05:00
Brian Talbot
0926395445
studio - alerts: added in close buttons and basic JS to control them/moved demo JS to alerts.html page
2013-02-26 12:32:20 -05:00
VikParuchuri
df01064e77
Merge pull request #1536 from MITx/diana/rubric-hot-keys
...
Add in rubric hotkeys
2013-02-26 06:46:26 -08: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
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
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
Brian Talbot
95ea01689f
studio - alerts: firmed up status-based notifications
2013-02-25 16:30:36 -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
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
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
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
Your Name
9f58f6890d
Merge branch 'master' into feature/victor/revert-revert-of-forums-ui
2013-02-25 09:31:28 -05:00
Victor Shnayder
db06efae75
Prevent scroll-to-top on clicks in cohorts views
...
Have to return false from event handlers to avoid href="#"
links from sending the user to the top of the page.
2013-02-24 19:44:41 -05: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
Brian Talbot
b1f5d67a96
studio - alerts: initial pass at alert styling and markup complete
2013-02-22 14:39:49 -05:00
Brian Talbot
60f803f369
studio - alerts: initial pass at alert styling and markup complete
2013-02-22 14:29:19 -05:00
Brian Talbot
bb24a079a1
studio - alerts: initial pass at alert styling and markup complete
2013-02-22 14:28:13 -05:00
Brian Talbot
d7bbfbc707
studio - alerts: basic layout and general alert styling WIP
2013-02-22 13:52:24 -05:00
Brian Talbot
de2b05bf66
Merge branch 'master' into feature/btalbot/studio-alerts
2013-02-22 12:01:50 -05:00
Ned Batchelder
ff35d3e6d9
Merge in a cherry-picked commit
2013-02-22 10:54:01 -05:00
Ned Batchelder
2e21c71fc4
A script to run just one test, based on the test failure description.
2013-02-22 10:52:25 -05:00
Diana Huang
ed955df230
Merge pull request #1529 from MITx/feature/vik/oe-messages
...
Feature/vik/oe messages
2013-02-22 07:31:06 -08: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
David Ormsbee
215f6aeb27
Merge pull request #1505 from MITx/feature/brian/pdf_js
...
Feature/brian/pdf js
2013-02-21 17:28:16 -08:00
Brian Wilson
d42a12da59
Merge remote-tracking branch 'origin/master' into feature/brian/pdf_js
2013-02-21 17:50:08 -05:00
Brian Wilson
8076c5b731
remove unneeded files (that break collectstatic)
2013-02-21 17:38:00 -05:00
chrisndodge
7e107119b7
Merge pull request #1535 from MITx/fix/cdodge/make-jump-to-handle-lost-slash
...
remove empty attempts and weights from simple test course
2013-02-21 12:43:15 -08:00
Chris Dodge
103508b45d
remove empty attempts and weights from simple test course
2013-02-21 15:41:59 -05:00
Brian Wilson
6d174ef029
remove dead code
2013-02-21 15:41:28 -05:00
Brian Wilson
d503fe3d79
Merge remote-tracking branch 'origin/master' into feature/brian/pdf_js
2013-02-21 15:38:28 -05:00
Brian Wilson
d5e34b0a44
fix initialization of scale dropdown, and check for valid values of page number
2013-02-21 15:35:03 -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
Brian Talbot
22639adc63
studio - alerts WIP
2013-02-21 14:31:24 -05: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
Ned Batchelder
3580deaec0
Merge pull request #1534 from MITx/fix/zoldak/test-modulestore-naming
...
Change test modulestore naming differentiation scheme to uuid
2013-02-21 11:01:58 -08:00
Your Name
ff68853990
Merge branch 'master' into feature/victor/revert-revert-of-forums-ui
2013-02-21 13:30:24 -05:00
