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

7902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Don Mitchell
c2f0ea49bd Hopefully fixed yamls for markdown 2013-01-07 12:32:54 -05:00
Don Mitchell
42246142dd Numerical response now works and round tripping works. 2013-01-07 11:50:37 -05:00
Don Mitchell
12abdbce73 Added 'has_markdown' property to templates in unit.html so that we can 
differentiate them in the drop down (just added MD to names for
now--brian's doing the official differentiation)
 2013-01-07 10:55:10 -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
cahrens
1c886b33cd Get buttons working again (with old behavior). 2013-01-03 12:24:17 -05:00
Don Mitchell
b5b11c696a Merge branch 'feature/cas/speed-editor' of git@github.com:MITx/mitx.git into feature/cas/speed-editor 2013-01-03 12:03:40 -05:00
Don Mitchell
47ca316d25 populate markdown into problem editor template 2013-01-03 12:02:45 -05:00
Brian Talbot
439addc130 resolving further Sass conflicts within unit editing view styling 2013-01-03 11:49:58 -05:00
Brian Talbot
7b75703556 resolving Sass issues caused by previous merge conflict resolution in branch 2013-01-03 11:44:09 -05:00
cahrens
68def8af5b Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-03 11:21:35 -05:00
cahrens
e60230dd5a More deletion 2013-01-03 11:21:01 -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
702636c00c Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-03 11:01:56 -05:00
Don Mitchell
31141299e8 Cache to pull CR's cleanup of branch 2013-01-03 11:00:41 -05:00
cahrens
b91e85c09f Remove tiny_mce. 2013-01-03 10:53:42 -05:00
cahrens
e1b7a266fb Remove askbot. 2013-01-03 10:42:54 -05:00
Don Mitchell
4f32d5f34d Merge commit 'af908104df8d18555ed2804b2e7f70577844de16' into feature/cas/speed-editor 
Conflicts:
	cms/static/sass/_assets.scss
	cms/static/sass/_base.scss
	cms/static/sass/_unit.scss
	cms/templates/unit.html
 2013-01-02 17:39:27 -05:00
chrisndodge
edd9b2bc7b Merge pull request #1220 from MITx/fix/cdodge/handout-links 
trigger another build
 2013-01-02 12:02:24 -08:00
Chris Dodge
b5ccb4b8fc trigger another build 2013-01-02 15:01:21 -05:00
chrisndodge
fa0fd4b50b Merge pull request #1219 from MITx/fix/cdodge/handout-links 
another comment commit just to trigger a new build
 2013-01-02 11:29:56 -08:00
Chris Dodge
d008cb9f3c another comment commit just to trigger a new build 2013-01-02 14:25:35 -05:00
Don Mitchell
94f396b988 Merge pull request #1218 from MITx/bug/btalbot/editview-images 
studio - resolved overflowing images in unit editing
 2013-01-02 10:19:36 -08:00
Brian Talbot
a5aafc42ad studio - resolved unit editing bug where larger images would overflow out of editing visual area 2013-01-02 12:58:59 -05:00
chrisndodge
a25021b613 Merge pull request #1215 from MITx/fix/cdodge/handout-links 
basically force another build by adding a comment
 2012-12-28 13:49:08 -08:00
Chris Dodge
cf3df23094 basically force another build by adding a comment 2012-12-28 16:48:02 -05:00
chrisndodge
3d6cbf4709 Merge pull request #1214 from MITx/fix/cdodge/handout-links 
add a comment. Namely we just want to trigger another build.
 2012-12-28 11:28:18 -08:00
Chris Dodge
f343052711 add a comment. Namely we just want to trigger another build. 2012-12-28 14:26:52 -05:00
chrisndodge
4834ed3574 Merge pull request #1213 from MITx/fix/cdodge/handout-links 
add forgotten new file
 2012-12-28 10:53:39 -08:00