Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

5216 Commits

Author SHA1 Message Date
Calen Pennington
c44898b1de Remove random printing during XModuleDescriptor equality check 2013-01-23 14:47:05 -05:00
Calen Pennington
2eca8bd0e9 Set default video position to 0, but don't overwrite it during __init__ 2013-01-23 14:47:05 -05:00
Calen Pennington
e5a6509bb0 Add a first_time_user attribute to CourseModule so that we can check for that explicitly, rather than looking for an implicitly created StudentModule 2013-01-23 14:47:05 -05:00
Calen Pennington
ce76b64bae Handle problem resets in such a way that the LoncapaProblem generates the new random seed, and the CapaModule saves that seed 2013-01-23 14:47:05 -05:00
Calen Pennington
9d66169d06 Don't set a seed to None that's already None 2013-01-23 14:47:05 -05:00
Calen Pennington
8e5373f993 Make Randomization return un-adjusted values as a passthrough 2013-01-23 14:47:05 -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
Ned Batchelder
376575dedd Make system.xblock_model_data more explicit to fix the problem where error descriptors can't get any data because the schema and the data don't match. 2013-01-23 11:34:24 -05: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
Diana Huang
5ca1586e0c Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates 2013-01-23 08:57:47 -05:00
Diana Huang
71e4541c69 Merge branch 'master' into feature/diana/rubric-input 2013-01-23 08:56:55 -05: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
Ned Batchelder
532285e558 Only need one of these lines. 2013-01-22 15:22:30 -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