Commit Graph

2457 Commits

Author SHA1 Message Date
Brian Talbot
5e7726079e studio html editor - styled <pre> and <code> elements, revised code tinyMCE icon 2013-01-22 23:32:51 -05:00
Brian Talbot
023dadd074 studio - resolved base variable missing issue on lms side 2013-01-22 16:31:42 -05:00
Brian Talbot
fd3ae2c478 studio html editor - matched up styles for <pre> elements 2013-01-22 16:16:30 -05:00
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
Diana Huang
9a53c37530 Use something more visually easy to use for self-assessment. 2013-01-22 11:25:12 -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
Alexander Kryklia
a228c163c7 added test for alternative answer notation 2013-01-21 15:56:38 +02:00
Alexander Kryklia
4215f4f923 add and update tests 2013-01-21 15:56:37 +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
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
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
Alexander Kryklia
65fd71d06b added documentation for rules 2013-01-21 15:56:34 +02:00
Alexander Kryklia
b540ca492a removed old flag use_targets 2013-01-21 15:56:34 +02:00
Alexander Kryklia
5c58881222 tests for drag and drop 2013-01-21 15:56:34 +02:00
Alexander Kryklia
01e4bdb831 added test for populate 2013-01-21 15:56:34 +02:00
Alexander Kryklia
e66e4040b1 replaced ordereddict with dict 2013-01-21 15:56:33 +02:00
Alexander Kryklia
87c58be742 removed course folder var from mako template 2013-01-21 15:56:33 +02:00
Alexander Kryklia
933f94a514 comment fix 2013-01-21 15:56:33 +02:00
Alexander Kryklia
4c23860e0f updated inputtype test without course_id ransferring 2013-01-21 15:56:33 +02:00
Alexander Kryklia
f02621876d removed course id 2013-01-21 15:56:33 +02:00
Alexander Kryklia
ad0a7d308c tests and test plan 2013-01-21 15:56:32 +02:00
Alexander Kryklia
e21048206a comments and refactoring 2013-01-21 15:56:32 +02:00
Alexander Kryklia
bdcf94dd40 comments and pepification 2013-01-21 15:56:32 +02:00
Alexander Kryklia
d9d093099d fixed dirname 2013-01-21 15:56:32 +02:00
Alexander Kryklia
b7be040222 updated case when no rule is processed 2013-01-21 15:56:32 +02:00
Alexander Kryklia
aaf54c562e fix in location id for course 2013-01-21 15:56:31 +02:00
Alexander Kryklia
1afaec6f61 update in tests 2013-01-21 15:56:31 +02:00
Alexander Kryklia
6aaad83abc finished interface change 2013-01-21 15:56:31 +02:00
Alexander Kryklia
17f11cef07 added comments 2013-01-21 15:56:31 +02:00
Valera Rozuvan
efdc4c7b7c Updated tests for new XML format. 2013-01-21 15:56:31 +02:00