Commit Graph

4251 Commits

Author SHA1 Message Date
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
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
11c330bf52 Fix rebase issues 2013-01-03 11:50:22 -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
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
Chris Dodge
e70db062b2 Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge
Conflicts:
	requirements.txt
2013-01-03 10:46:24 -05:00
Chris Dodge
7229a9cdaf perform a new merge from master, resolve conflicts 2013-01-03 10:43:03 -05:00
Calen Pennington
465c85b04b Make model classes inherit their parents fields attribute 2013-01-02 15:08:49 -05:00
Calen Pennington
0bed19648e Remove filename and giturl references 2013-01-02 15:08:27 -05:00
Calen Pennington
8e0d218c7d Stop using .definition and .metadata directly 2013-01-02 15:06:43 -05:00
Calen Pennington
60fa8619cb Fixing tests 2013-01-02 10:37:49 -05:00
David Ormsbee
8bf393fbba Merge pull request #1182 from MITx/bridger/feature/ungraded_course
Visual changes for ungraded courses
2013-01-02 07:19:34 -08:00
Calen Pennington
6427dd6742 WIP: Get the cms running. Component previews work 2013-01-02 09:07:02 -05:00
Calen Pennington
85e109da57 Allow field scope of None 2013-01-02 09:05:49 -05:00
Calen Pennington
344cb133aa Make import/export tests pass 2013-01-02 09:05:49 -05:00
Calen Pennington
6a612a6e02 Trim down list of equality attributes for descriptors 2013-01-02 09:05:49 -05:00
Calen Pennington
265a2e7630 Give children the None scope 2013-01-02 09:05:48 -05:00
Calen Pennington
fa75245e8a WIP: Start cleaning up CMS to work with new field format 2013-01-02 09:05:48 -05:00
Calen Pennington
6ece7fd541 Fieldify the video module 2012-12-28 14:56:43 -05:00
Calen Pennington
84cb0ce99b Move inheritance logic out into a separate file in the modulestore 2012-12-28 14:56:42 -05:00
Calen Pennington
48a1e09133 Pass in state to LCP on reset 2012-12-28 14:55:32 -05:00
Calen Pennington
c7069be2a4 Centralize logic for standardizing rerandomize values 2012-12-28 14:55:32 -05:00
Calen Pennington
e4c06fab4a Cleaning up ABTest properties 2012-12-28 14:55:32 -05:00
Calen Pennington
4b6ec85dcb Minor cleanups 2012-12-28 14:55:32 -05:00