cahrens
|
731fb209de
|
Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce
Conflicts:
cms/static/css/tiny-mce.css
|
2013-01-22 16:15:27 -05:00 |
|
Brian Talbot
|
aec7692d27
|
studio html editor - revised header styles for editing/displaying HTML components (including separating studio editing chrome from style rules)
|
2013-01-22 15:51:12 -05:00 |
|
cahrens
|
13945994f0
|
change class on right element!
|
2013-01-22 15:47:09 -05:00 |
|
cahrens
|
b554eb5afe
|
Cleanup of format dropdown, toolbar buttons.
|
2013-01-22 15:28:47 -05:00 |
|
Calen Pennington
|
75b0a8eed6
|
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
|
2013-01-22 14:47:52 -05:00 |
|
Diana Huang
|
24f23176af
|
Add the ability to set up custom text for short form and
and long form results.
|
2013-01-22 13:17:37 -05:00 |
|
Chris Dodge
|
9520290018
|
add optional course_id parameter to DraftMongoStore.get_items()
|
2013-01-22 11:55:36 -05:00 |
|
Don Mitchell
|
edda80d485
|
New style base python classes and basestring type.
|
2013-01-22 11:30:24 -05:00 |
|
Diana Huang
|
9a53c37530
|
Use something more visually easy to use for self-assessment.
|
2013-01-22 11:25:12 -05:00 |
|
Brian Wilson
|
9653631e9a
|
Add initial openid_provider tests (covers xrds and authentication requests)
|
2013-01-22 11:15:30 -05:00 |
|
Diana Huang
|
a34a9dd038
|
Merge branch 'master' into diana/open-ended-ui-updates
|
2013-01-22 08:40:40 -05:00 |
|
Diana Huang
|
e7bc32fd4d
|
Merge branch 'master' into feature/diana/rubric-input
|
2013-01-22 08:38:17 -05:00 |
|
Alexander Kryklia
|
91281915c4
|
update of deleted comment
|
2013-01-21 19:28:49 +02:00 |
|
Alexander Kryklia
|
00f966a94a
|
populate -> __init__
|
2013-01-21 19:22:23 +02:00 |
|
Alexander Kryklia
|
a95e809824
|
documentation extended
|
2013-01-21 19:05:30 +02:00 |
|
Alexander Kryklia
|
2d67ee477e
|
commend about rule in simple form
|
2013-01-21 18:58:30 +02:00 |
|
Alexander Kryklia
|
0f5e7cd9e4
|
explained for - else
|
2013-01-21 18:55:29 +02:00 |
|
Alexander Kryklia
|
e78c020a52
|
removed dublicate comment
|
2013-01-21 18:38:03 +02:00 |
|
Alexander Kryklia
|
07c1085966
|
improved readability of drag and drop render test
|
2013-01-21 18:33:17 +02:00 |
|
Alexander Kryklia
|
3e0333309d
|
removed openendedinput
|
2013-01-21 18:03:04 +02:00 |
|
Valera Rozuvan
|
47d1173394
|
Refactoring and cleaning of code.
|
2013-01-21 15:56:39 +02:00 |
|
Valera Rozuvan
|
3cc4a663ff
|
Refactoring and cleaning of code.
|
2013-01-21 15:56:38 +02:00 |
|
Alexander Kryklia
|
a228c163c7
|
added test for alternative answer notation
|
2013-01-21 15:56:38 +02:00 |
|
Valera Rozuvan
|
5457f35f81
|
Drag and Drop: Further testing of new feature "can reuse".
|
2013-01-21 15:56:38 +02:00 |
|
Valera Rozuvan
|
7ad6ef21f4
|
Removed unnecessary debug information.
|
2013-01-21 15:56:38 +02:00 |
|
Valera Rozuvan
|
1eec7bada7
|
Updated docs. Added debug output info for tracing problem related to server communications.
|
2013-01-21 15:56:38 +02:00 |
|
Valera Rozuvan
|
0f7b89facc
|
Bug fixes for new functionality: Draggable "is reusable".
|
2013-01-21 15:56:38 +02:00 |
|
Valera Rozuvan
|
5001680356
|
Implemented isReusable feature. Not fully tested.
|
2013-01-21 15:56:38 +02:00 |
|
Valera Rozuvan
|
98977cabdb
|
Refactoring of Drag and Drop complete. Draggable properties isUsable, isOriginal included, but functionality connected with them is not complete. Found and fixed bug with z-index ordering.
|
2013-01-21 15:56:37 +02:00 |
|
Valera Rozuvan
|
f15887383e
|
Refactoring.
|
2013-01-21 15:56:37 +02:00 |
|
Valera Rozuvan
|
8b3a8a30ab
|
Refactoring.
|
2013-01-21 15:56:37 +02:00 |
|
Alexander Kryklia
|
4215f4f923
|
add and update tests
|
2013-01-21 15:56:37 +02:00 |
|
Valera Rozuvan
|
79f5e98dfc
|
Drag and Drop: refactoring + preparing for reuse of draggables.
|
2013-01-21 15:56:36 +02:00 |
|
Alexander Kryklia
|
e47f0e45f2
|
unorderly->unordered
|
2013-01-21 15:56:36 +02:00 |
|
Alexander Kryklia
|
e017297d3f
|
fix
|
2013-01-21 15:56:36 +02:00 |
|
Alexander Kryklia
|
c8bbcacfef
|
labels reuse logic and tests
|
2013-01-21 15:56:36 +02:00 |
|
Valera Rozuvan
|
ead346ee5f
|
Refactoring. New feature: adding multiple draggables from one.
|
2013-01-21 15:56:36 +02:00 |
|
Alexander Kryklia
|
e2bbaf08b9
|
removed use_targets flag
|
2013-01-21 15:56:35 +02:00 |
|
Alexander Kryklia
|
0349e157b5
|
renamed graders to verifiers
|
2013-01-21 15:56:35 +02:00 |
|
Alexander Kryklia
|
63b79f76d7
|
added can_reuse
|
2013-01-21 15:56:35 +02:00 |
|
Valera Rozuvan
|
22014f7f58
|
New feature: Clicking on number for multiple icons on target will cycle all icons on target. Fixed bug with z-order ordering.
|
2013-01-21 15:56:35 +02:00 |
|
Alexander Kryklia
|
f157702548
|
fix
|
2013-01-21 15:56:35 +02:00 |
|
Alexander Kryklia
|
c2dec3fb9d
|
label bg color
|
2013-01-21 15:56:35 +02:00 |
|
Valera Rozuvan
|
6d7cfe08df
|
Slight UI modification.
|
2013-01-21 15:56:35 +02:00 |
|
Valera Rozuvan
|
15ffc1f64f
|
New feature: added ability to define custom label background color. Upated demo to use this feature. Needs to be turned on Python side.
|
2013-01-21 15:56:35 +02:00 |
|
Valera Rozuvan
|
f92c0bdceb
|
New feature: when the draggable is out of the slider container, if it has a label, the label will get a background. This way it is much easier to discern the label against the base image.
|
2013-01-21 15:56:34 +02:00 |
|
Alexander Kryklia
|
65fd71d06b
|
added documentation for rules
|
2013-01-21 15:56:34 +02:00 |
|
Valera Rozuvan
|
cd6e220ead
|
Fixed annoying bug whre if you dragged any part of the base image or other parts of the Drag and Drop problem, then the browser would start highlighting the elements.
|
2013-01-21 15:56:34 +02:00 |
|
Alexander Kryklia
|
b540ca492a
|
removed old flag use_targets
|
2013-01-21 15:56:34 +02:00 |
|
Valera Rozuvan
|
b7b25369e0
|
Added mouse event handlers to container of draggable. Now it is easier to initiate a dragging operation.
|
2013-01-21 15:56:34 +02:00 |
|