Commit Graph

4140 Commits

Author SHA1 Message Date
Calen Pennington
789ac3fc87 Use the XBlock library as the base for XModule, so that we can incrementally rely on more and more of the XBlock api 2013-01-04 16:19:58 -05:00
Diana Huang
e88fbd26e3 Merge branch 'master' into feature/diana/rubric-input 2013-01-04 14:12:18 -05:00
cahrens
2859cfddd0 minor cleanup 2013-01-04 12:37:00 -05:00
cahrens
ecfc96c73b Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-04 09:57:15 -05:00
cahrens
e017363ae1 Tabs now showing. 2013-01-04 09:56:52 -05:00
Don Mitchell
591f1be8ba Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-04 09:51:47 -05:00
Don Mitchell
d99e7f5d33 Supports markdown 2013-01-04 09:51:36 -05:00
cahrens
5493fd586a Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-04 09:05:09 -05:00
cahrens
6d732c217b Tabs now showing. 2013-01-04 09:04:27 -05:00
ichuang
c555bf5a8d fix capa to add contextualize_text for optionresponse and multiplechoice 2013-01-03 22:57:24 -05:00
Don Mitchell
7dfa4e2cba Tabla rasa problem for expert authors 2013-01-03 17:20:40 -05:00
Don Mitchell
3e16e4cf5f Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-03 14:43:00 -05:00
Don Mitchell
ac5b48e827 Treat metadata['markdown'] as not key/value editable but still
persistable.
2013-01-03 14:42:40 -05:00
cahrens
533f4876b5 Rename, add css file. 2013-01-03 14:27:32 -05:00
cahrens
8dd02c7ec7 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-03 14:11:58 -05:00
cahrens
f443c66bcd Rename, add css file. 2013-01-03 14:11:53 -05:00
Don Mitchell
d11243578b Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-03 13:50:16 -05:00
Don Mitchell
63791b2a6b Numerical response template has markdown init 2013-01-03 13:46:45 -05:00
cahrens
b4312cbfef Starting the markdown editor. 2013-01-03 13:39:01 -05:00
Don Mitchell
f3ba15731c Cache to swap branches 2013-01-03 13:04:30 -05:00
cahrens
e09a8e4a9b Don't show markdown if it doesn't exist. 2013-01-03 12:50:38 -05:00
Calen Pennington
8874d9d7f8 Add a draft implementation of the Poll module for Justice 2013-01-03 12:21:13 -05:00
Don Mitchell
47ca316d25 populate markdown into problem editor template 2013-01-03 12:02:45 -05:00
Vik Paruchuri
b01666f6d6 Fix error messages 2013-01-03 11:52:35 -05:00
Vik Paruchuri
5567477c67 Pass through initial display and answer 2013-01-03 11:52:35 -05:00
Vik Paruchuri
0c3eb67d5c More descriptive error message 2013-01-03 11:52:35 -05:00
Vik Paruchuri
cce6b70103 Fixes to log entire state on errors, format feedback better 2013-01-03 11:52:05 -05:00
Vik Paruchuri
68f0f7e0a8 Handle unicode feedback 2013-01-03 11:50:57 -05:00
Vik Paruchuri
a4eb76017b Display max score as well as score 2013-01-03 11:50:57 -05:00
Vik Paruchuri
9559c7b426 Patch "correct" answer display 2013-01-03 11:50:57 -05:00
Vik Paruchuri
37af39ef8d Change names 2013-01-03 11:50:57 -05:00
Vik Paruchuri
11c330bf52 Fix rebase issues 2013-01-03 11:50:22 -05:00
Vik Paruchuri
2c469cad75 Wire in submit message 2013-01-03 11:49:01 -05:00
Vik Paruchuri
1ac75b9420 Add in message passing pipeline 2013-01-03 11:47:41 -05:00
Diana Huang
09ed3d12a2 Hook up the backend into the new feedback response for scores 2013-01-03 11:40:41 -05:00
Diana Huang
c87d0f11d6 Show error when no score selected 2013-01-03 11:40:41 -05:00
Diana Huang
de7d6f184a Parse out the score given into an int. 2013-01-03 11:40:41 -05:00
Diana Huang
8f4efb0456 Hook up new radio buttons to the Javascript 2013-01-03 11:40:41 -05:00
Diana Huang
69ae1cc268 Clean up the styling and make the evaluation parts collapsible. 2013-01-03 11:40:41 -05:00
Diana Huang
54c541de45 Fix up the feedback-on-feedback styling and add radio button score selection. 2013-01-03 11:40:41 -05:00
Vik Paruchuri
fa97187a31 Patch naming issue 2013-01-03 11:40:41 -05:00
Vik Paruchuri
ad41558379 Hide submit button 2013-01-03 11:40:41 -05:00
Vik Paruchuri
b06ce84afd Wire in submit message 2013-01-03 11:40:41 -05:00
Vik Paruchuri
b71233fd50 Add in message passing pipeline 2013-01-03 11:40:41 -05:00
Vik Paruchuri
ce3b84d0e5 Message passing in lms 2013-01-03 11:40:41 -05:00
Vik Paruchuri
b782f712b9 Add in more js to handle student feedback 2013-01-03 11:40:41 -05:00
Vik Paruchuri
634b586085 Integrate new ajax action 2013-01-03 11:40:41 -05:00
Vik Paruchuri
d663d23257 Work on adding in a new ajax post type 2013-01-03 11:40:41 -05:00
Don Mitchell
4e9d5c8a6a Placeholders for markdown editor js and reference to pull it in from
CapaDescriptor. Overrode XMLEditorDescription
2013-01-03 11:15:06 -05:00
Don Mitchell
31141299e8 Cache to pull CR's cleanup of branch 2013-01-03 11:00:41 -05:00