Don Mitchell
|
f2b43ec459
|
Merge pull request #1343 from MITx/feature/christina/tiny-mce
Make code inline instead of block.
|
2013-01-24 05:34:36 -08:00 |
|
cahrens
|
711cc9a041
|
Tell tinyMCE to not change image paths.
#143
|
2013-01-23 20:18:28 -05:00 |
|
cahrens
|
4a79643fde
|
Make code inline instead of block.
|
2013-01-23 16:43:49 -05:00 |
|
Victor Shnayder
|
abcc5c0204
|
Merge pull request #1342 from MITx/feature/cdodge/add-standard-problem-metadata
update templates to include attemps and weight values. Also update capa_...
|
2013-01-23 13:40:46 -08:00 |
|
Chris Dodge
|
2856971b45
|
update templates to include attemps and weight values. Also update capa_module.py to accept empty strings ('') to mean 'default value'
|
2013-01-23 16:36:16 -05:00 |
|
chrisndodge
|
fe8e25e72d
|
Merge pull request #1341 from MITx/feature/christina/tiny-mce
Toggling of code should mark editor as dirty.
|
2013-01-23 13:25:01 -08:00 |
|
cahrens
|
2969a9e48d
|
Toggling of code should mark editor as dirty.
|
2013-01-23 16:19:17 -05:00 |
|
Chris Dodge
|
9d5ac308b1
|
remove flag to hide progress tab
|
2013-01-23 15:11:41 -05:00 |
|
Brian Talbot
|
5fee7eeaec
|
studio - further resolved bug with .header CSS inheritance and problem editor menu UI
|
2013-01-23 12:58:20 -05:00 |
|
Brian Talbot
|
2ca267dc52
|
studio - resolved bug with .header CSS inheritance and problem editor menu UI
|
2013-01-23 12:50:10 -05:00 |
|
Don Mitchell
|
b0bbb34644
|
Merge pull request #1331 from MITx/feature/christina/tiny-mce
Feature/christina/tiny mce
|
2013-01-23 09:14:42 -08:00 |
|
cahrens
|
2609ba4093
|
Delete unused icon, reorder dropdown.
|
2013-01-23 11:02:16 -05:00 |
|
Don Mitchell
|
966db4fbaf
|
Merge pull request #1329 from MITx/fix/cdodge/draft-store-get-items
add optional course_id parameter to DraftMongoStore.get_items()
|
2013-01-23 07:39:36 -08:00 |
|
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 |
|
Chris Dodge
|
9520290018
|
add optional course_id parameter to DraftMongoStore.get_items()
|
2013-01-22 11:55:36 -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 |
|