Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,098 Commits 1 Branch 0 Tags
2d8ddb0dcb4bc5b20ff05486ce3a71fbe5f0939e
Commit Graph

1145 Commits

Author SHA1 Message Date
Don Mitchell
76f2ef6f7c Empty template now recognized as allowing markdown editing 
Save saves markdown and updates the xml
 2013-01-08 10:53:45 -05:00
Don Mitchell
735aa13496 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-07 16:48:57 -05:00
Don Mitchell
e46a76da98 xml conversion unit tests plus a fix to the conversion which they 
brought to light
 2013-01-07 16:48:42 -05:00
cahrens
5711a9af68 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-07 15:32:39 -05:00
cahrens
d7b05e485d Add insertion of problem types. 2013-01-07 15:32:11 -05:00
Don Mitchell
d8d4c37331 Yaml files now generate markdown in a readable and xml convertable 
format. The xml converter works.
 2013-01-07 13:57:21 -05:00
Don Mitchell
9dad3ba90d Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-07 12:33:55 -05:00
Don Mitchell
c2f0ea49bd Hopefully fixed yamls for markdown 2013-01-07 12:32:54 -05:00
cahrens
75b9740932 Update for Don's change. 2013-01-07 12:08:34 -05:00
cahrens
e296d52c7d merge 2013-01-07 12:06:12 -05:00
cahrens
be07c7f86f Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-07 12:01:54 -05:00
cahrens
bf2a945a6c Starting to add toolbar items. 2013-01-07 12:01:12 -05:00
Don Mitchell
42246142dd Numerical response now works and round tripping works. 2013-01-07 11:50:37 -05:00
cahrens
4740965413 Skip tests instead of commenting them out (for merge that is coming). 2013-01-07 10:49:10 -05:00
cahrens
9ec658cf7d Skip tests that aren't passing. This is a few capa test points, all of sequence, and all video tests. 2013-01-07 10:25:42 -05:00
cahrens
534c294e08 Merge branch 'feature/cale/cms-master' into feature/christina/misc 2013-01-07 09:59:42 -05:00
cahrens
ab1173cfdc Merge with cms-master. 2013-01-07 09:59:08 -05:00
cahrens
05428f5b07 Comment out markdown in optionresponse.yaml, hook up toXML method. 2013-01-05 15:08:09 -05:00
cahrens
164d8a50f1 Move toXML code into edit.coffee, create unit test scaffolding. 2013-01-05 14:39:58 -05:00
cahrens
96bad91353 Comment out Jasmine tests that are failing. 2013-01-05 14:07:34 -05:00
cahrens
65ee5105e2 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-05 13:16:44 -05:00
Don Mitchell
2e527a6ae0 Fixed all regex's in toXml (I hope) and added 2 markdown templates 2013-01-04 17:15:44 -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
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
Don Mitchell
47ca316d25 populate markdown into problem editor template 2013-01-03 12:02:45 -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
Chris Dodge
c0f12e69f7 fixes on the export. There's some attributes not being handled correctly 2012-12-27 16:15:52 -05:00
Chris Dodge
625237601f Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/export 
Conflicts:
	common/lib/xmodule/xmodule/contentstore/content.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
 2012-12-27 14:16:40 -05:00
Don Mitchell
53b73ca3da Merge pull request #1208 from MITx/feature/cdodge/clone-course 
fix up some thumbnail issues. Also we need to manage the user permission...
 2012-12-27 09:26:51 -08:00
Chris Dodge
28d9827468 fix up some thumbnail issues. Also we need to manage the user permissions when we clone and delete course 2012-12-27 10:20:28 -05:00
Don Mitchell
83bc9d7bf8 Grader unit tests (partial) 2012-12-26 15:48:37 -05:00