cahrens
|
c7feee5b67
|
Delete speed-editor.js and cruft from unit.html.
|
2013-01-08 15:39:45 -05:00 |
|
cahrens
|
4ac15daf44
|
Fix formatting.
|
2013-01-08 15:04:48 -05:00 |
|
cahrens
|
94696786c0
|
Merge in Don's change.
|
2013-01-08 14:57:15 -05:00 |
|
cahrens
|
f616aecd81
|
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
Conflicts:
common/lib/xmodule/xmodule/js/src/problem/edit.coffee
|
2013-01-08 14:56:59 -05:00 |
|
cahrens
|
bc10d080df
|
Save work
|
2013-01-08 13:39:16 -05:00 |
|
Don Mitchell
|
ae4e7815a9
|
CapaDescriptor new unit tests
|
2013-01-08 13:16:38 -05:00 |
|
Don Mitchell
|
6e2b4a07d8
|
Added is_empty to model presented to unit.html
|
2013-01-08 11:18:57 -05:00 |
|
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 |
|
Jay Zoldak
|
0e9cf17b82
|
Merge pull request #1232 from MITx/feature/christina/misc
Feature/christina/misc
|
2013-01-07 08:43:48 -08:00 |
|
cahrens
|
c443cd83fa
|
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
|
2013-01-07 11:17:05 -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
|
b108435a32
|
Make xmodule Jasmine tests fail build.
|
2013-01-07 10:51:32 -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 |
|
chrisndodge
|
7ced6b5e68
|
Merge pull request #1222 from MITx/feature/cale/cms-master-merge
Feature/cale/cms master merge
|
2013-01-07 06:54:57 -08: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 |
|
Chris Dodge
|
1d7baccb38
|
add info-icon.png
|
2013-01-04 11:41:16 -05:00 |
|
Chris Dodge
|
349fd89eb8
|
fix tests on merge
|
2013-01-04 10:32:31 -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 |
|