Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

9300 Commits

Author SHA1 Message Date
Don Mitchell
020e1e94fb Move side effecting of definition for grader to the course_module and 
don't make caller responsible.
 2013-03-04 15:38:47 -05:00
Victor Shnayder
df5ad6ba42 Merge pull request #1574 from MITx/fix/will/cs191_matrix_style_bug 
Fix/will/cs191 matrix style bug
 2013-03-04 12:28:12 -08:00
Chris Dodge
a81e9a673c additional courseware view optimizations. Do a 'depth' fetch on the selected section so that it does a more efficient set of queries to the database. Also, in the CachingDescriptorSystem, if we have a 'cache miss', when we do the actual fetch (which creates a new 'system'), keep that fetched data around in our own collection, in case it is queried again 2013-03-04 14:59:45 -05:00
David Ormsbee
9d2a2cbc2f Merge pull request #1555 from MITx/feature/jkarni/foldit-api 
Feature/jkarni/foldit api
 2013-03-04 11:40:43 -08:00
Arthur Barrett
b0abfa07c8 style the guided discussion text so it is boxed like the instructions text. 2013-03-04 14:23:41 -05:00
Arthur Barrett
2e6115c734 constrain the annotation call-out horizontally so it is always visible in the window 2013-03-04 14:19:28 -05:00
Will Daly
1cc8950780 Added comments for make_dict_of_responses() in capa module 2013-03-04 12:45:13 -05:00
Will Daly
082216395c Added unit test for conversion of GET parameters for capa module. 
Added error checking for possible error cases
 2013-03-04 12:38:11 -05:00
Ned Batchelder
7c8a90229e Use 'is None' and 'is not None' 2013-03-04 10:57:25 -05:00
Ned Batchelder
97f1e04282 Fix some 2-space indents 2013-03-04 10:57:25 -05:00
Calen Pennington
ee6c3d6b7e Make advertised_start work when it's not parseable as a date 2013-03-04 09:02:51 -05:00
jmclaus
72b7193c03 Genex is gradable 2013-03-03 10:43:16 +01:00
Will Daly
548f9b85a8 Changed response_msg argument default to '' 2013-03-01 17:07:23 -05:00
Arthur Barrett
20174fd24a Removing failing jasmine tests for now. 2013-03-01 17:06:12 -05:00
Vik Paruchuri
4400f94196 Fix some xml issues in yaml 2013-03-01 16:41:18 -05:00
Will Daly
28a502ea97 Fixed a bug in CorrectMaps.get_npoints(), which would return 1 
when npoints=0.
 2013-03-01 16:40:54 -05:00
chrisndodge
c236b2c8a9 Merge pull request #1550 from MITx/feature/cdodge/add-test-delete 
add another command line argument to allow users to only simulate a dele...
 2013-03-01 13:29:06 -08:00
Victor Shnayder
88bfdd01ce Merge pull request #1561 from MITx/feature/will/move_correct_mark_for_multiple_choice 
Feature/will/move correct mark for multiple choice
 2013-03-01 12:52:26 -08:00
Chris Dodge
0047295695 Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/add-test-delete 2013-03-01 15:48:23 -05:00
Will Daly
d6df7e2d96 Added comments to clean_message_html 2013-03-01 15:04:01 -05:00
Vik Paruchuri
9f020e228b Add in some dummy values 2013-03-01 14:50:40 -05:00
Calen Pennington
f4032caeaf Merge branch 'feature/cale/xmodule-storage-model' into feature/alex/poll-merged 
Conflicts:
	common/lib/xmodule/xmodule/conditional_module.py
 2013-03-01 14:13:58 -05:00
Vik Paruchuri
a818191297 Prelim support for combinedopenended and peergrading types 2013-03-01 14:12:04 -05:00
Arthur Barrett
530051037d adding annotatable module template 2013-03-01 13:58:39 -05:00
Vik Paruchuri
c24ba23e54 Move self assessment templates 2013-03-01 13:45:55 -05:00
Vik Paruchuri
b0c2559de8 Switch around template locations 2013-03-01 13:43:01 -05:00
Arthur Barrett
82544f2ae1 start adding jasmine tests to module 2013-03-01 13:39:51 -05:00
Arthur Barrett
6dba2394b2 enable studio authoring (raw) for xmodule 2013-03-01 13:32:56 -05:00
Vik Paruchuri
b3d0abbd05 Start to move around templates 2013-03-01 13:31:54 -05:00
VikParuchuri
d186e5d186 Merge pull request #1538 from MITx/diana/fix-import-export 
Fix studio import and export for CombinedOpenEnded, PeerGrading XModules
 2013-03-01 09:32:08 -08:00
David Ormsbee
d6957f3e7e Merge pull request #1508 from MITx/feature/ichuang/fix-save-button-messages-and-add-capa-survey-mode 
Fix capa save button msgs & add simple capa survey mode
 2013-03-01 08:26:21 -08:00
Will Daly
8265181477 If there are multiple inputs, but only one message specified, 
the message is now applied to the entire response.
 2013-03-01 11:17:31 -05:00
e0d
4e10eb10e3 locking deps versions based on pip freeze in production. 2013-03-01 10:15:07 -05:00
Will Daly
9ac8ef542f Overall message HTMl now correctly renders when multiple HTML tags are 
passed as the message (even when there's no root tag)
 2013-03-01 09:40:38 -05:00
Will Daly
952716af13 Added clean-up code for message HTML. 
If overall message is a parseable XHTML tree,
it is inserted as a tree rather than text.
 2013-03-01 09:40:38 -05:00
Will Daly
68cf4c4535 Added tests for HTMl rendering of problems 
Added support for rendering response messages
 2013-03-01 09:40:38 -05:00
Will Daly
9f6119a19a * Fixed a bug in CorrectMap in which overall_message was not copied 
in the update() method
* Implemented CustomResponse behavior for returning overall_message,
  with unit tests
* Added additional CustomResponse unit tests for exception handling
 2013-03-01 09:40:38 -05:00
Will Daly
3dd49881c3 * Wrote unit tests for correctmap. 
* Fixed potential KeyError in correctmap.get_queue_time_str()
* Modified correctmap.get_npoints() to return 0 if answer is incorrect,
    even when npoints has been set.
* Added overall_message attribute to CorrectMap to allow
messages that apply to the entire question, not just an individual input
 2013-03-01 09:40:38 -05:00
Arthur Barrett
3d4510ab0c fixed sass compiler issue with annotatable xmodule on cms 2013-02-28 18:35:32 -05:00
Victor Shnayder
136946a334 Merge remote-tracking branch 'origin/master' into feature/abarrett/annotatable_xmodule 2013-02-28 18:22:13 -05:00
Arthur Barrett
0461d72884 fixed tag prompt default text 2013-02-28 16:31:15 -05:00
Arthur Barrett
179a4af5e7 fixed failing annotationinput test and refactored response factory 2013-02-28 15:37:14 -05:00
Arthur Barrett
3f40781612 adjusted "incorrect" icon placement when no annotation options submitted. 2013-02-28 14:24:53 -05:00
Arthur Barrett
430449501e deleting test file 2013-02-28 14:06:46 -05:00
Christina Roberts
1b9d105e35 Merge pull request #1568 from MITx/bug/christina/misc 
Don't require text tag around multiple choice/checkbox answers.
 2013-02-28 10:48:08 -08:00
Arthur Barrett
6b74dcf782 adding unit test for annotationinput 2013-02-28 13:38:29 -05:00
cahrens
2be42b8f51 Don't require text tag around multiple choice/checkbox answers. 
https://edx.lighthouseapp.com/projects/102637/tickets/196
 2013-02-28 13:33:04 -05:00
Arthur Barrett
15f6edc2f2 Merge branch 'master' into feature/abarrett/annotatable_xmodule 2013-02-28 13:11:40 -05:00
Arthur Barrett
bc6a085fdf converted annotationinput tests to the new responsetype testing format. 2013-02-28 13:10:37 -05:00
Vasyl Nakvasiuk
e9dacfae09 remove self.contents from ConditionalModule 2013-02-28 20:07:59 +02:00