Commits · 5711a9af685cf1997b8f92c254ace05bb87b8dcc · edx / edx-platform · GitLab

07 Jan, 2013 19 commits
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · 5711a9af
  cahrens committed Jan 07, 2013
  
  5711a9af Browse Files
- Add insertion of problem types. · d7b05e48
  cahrens committed Jan 07, 2013
  
  d7b05e48 Browse Files
- Yaml files now generate markdown in a readable and xml convertable · d8d4c373
```
format. The xml converter works. 
```
  Don Mitchell committed Jan 07, 2013
  d8d4c373 Browse Files
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · 9dad3ba9
  Don Mitchell committed Jan 07, 2013
  
  9dad3ba9 Browse Files
- Hopefully fixed yamls for markdown · c2f0ea49
  Don Mitchell committed Jan 07, 2013
  
  c2f0ea49 Browse Files
- Update for Don's change. · 75b97409
  cahrens committed Jan 07, 2013
  
  75b97409 Browse Files
- merge · e296d52c
  cahrens committed Jan 07, 2013
  
  e296d52c Browse Files
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · be07c7f8
  cahrens committed Jan 07, 2013
  
  be07c7f8 Browse Files
- Starting to add toolbar items. · bf2a945a
  cahrens committed Jan 07, 2013
  
  bf2a945a Browse Files
- Numerical response now works and round tripping works. · 42246142
  Don Mitchell committed Jan 07, 2013
  
  42246142 Browse Files
- Merge pull request #1232 from MITx/feature/christina/misc · 0e9cf17b
```
Feature/christina/misc
```
  Jay Zoldak committed Jan 07, 2013
  0e9cf17b Browse Files
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · c443cd83
  cahrens committed Jan 07, 2013
  
  c443cd83 Browse Files
- Added 'has_markdown' property to templates in unit.html so that we can · 12abdbce
```
differentiate them in the drop down (just added MD to names for
now--brian's doing the official differentiation)
```
  Don Mitchell committed Jan 07, 2013
  12abdbce Browse Files
- Make xmodule Jasmine tests fail build. · b108435a
  cahrens committed Jan 07, 2013
  
  b108435a Browse Files
- Skip tests instead of commenting them out (for merge that is coming). · 47409654
  cahrens committed Jan 07, 2013
  
  47409654 Browse Files
- Skip tests that aren't passing. This is a few capa test points, all of sequence,… · 9ec658cf
```
Skip tests that aren't passing. This is a few capa test points, all of sequence, and all video tests.
```
  cahrens committed Jan 07, 2013
  9ec658cf Browse Files
- Merge branch 'feature/cale/cms-master' into feature/christina/misc · 534c294e
  cahrens committed Jan 07, 2013
  
  534c294e Browse Files
- Merge with cms-master. · ab1173cf
  cahrens committed Jan 07, 2013
  
  ab1173cf Browse Files
- Merge pull request #1222 from MITx/feature/cale/cms-master-merge · 7ced6b5e
```
Feature/cale/cms master merge
```
  chrisndodge committed Jan 07, 2013
  7ced6b5e Browse Files
05 Jan, 2013 4 commits
- Comment out markdown in optionresponse.yaml, hook up toXML method. · 05428f5b
  cahrens committed Jan 05, 2013
  
  05428f5b Browse Files
- Move toXML code into edit.coffee, create unit test scaffolding. · 164d8a50
  cahrens committed Jan 05, 2013
  
  164d8a50 Browse Files
- Comment out Jasmine tests that are failing. · 96bad913
  cahrens committed Jan 05, 2013
  
  96bad913 Browse Files
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · 65ee5105
  cahrens committed Jan 05, 2013
  
  65ee5105 Browse Files
04 Jan, 2013 10 commits
- Fixed all regex's in toXml (I hope) and added 2 markdown templates · 2e527a6a
  Don Mitchell committed Jan 04, 2013
  
  2e527a6a Browse Files
- minor cleanup · 2859cfdd
  cahrens committed Jan 04, 2013
  
  2859cfdd Browse Files
- add info-icon.png · 1d7baccb
  Chris Dodge committed Jan 04, 2013
  
  1d7baccb Browse Files
- fix tests on merge · 349fd89e
  Chris Dodge committed Jan 04, 2013
  
  349fd89e Browse Files
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · ecfc96c7
  cahrens committed Jan 04, 2013
  
  ecfc96c7 Browse Files
- Tabs now showing. · e017363a
  cahrens committed Jan 04, 2013
  
  e017363a Browse Files
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · 591f1be8
  Don Mitchell committed Jan 04, 2013
  
  591f1be8 Browse Files
- Supports markdown · d99e7f5d
  Don Mitchell committed Jan 04, 2013
  
  d99e7f5d Browse Files
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · 5493fd58
  cahrens committed Jan 04, 2013
  
  5493fd58 Browse Files
- Tabs now showing. · 6d732c21
  cahrens committed Jan 04, 2013
  
  6d732c21 Browse Files
03 Jan, 2013 7 commits
- Tabla rasa problem for expert authors · 7dfa4e2c
  Don Mitchell committed Jan 03, 2013
  
  7dfa4e2c Browse Files
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · 3e16e4cf
  Don Mitchell committed Jan 03, 2013
  
  3e16e4cf Browse Files
- Treat metadata['markdown'] as not key/value editable but still · ac5b48e8
```
persistable.
```
  Don Mitchell committed Jan 03, 2013
  ac5b48e8 Browse Files
- Rename, add css file. · 533f4876
  cahrens committed Jan 03, 2013
  
  533f4876 Browse Files
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · 8dd02c7e
  cahrens committed Jan 03, 2013
  
  8dd02c7e Browse Files
- Rename, add css file. · f443c66b
  cahrens committed Jan 03, 2013
  
  f443c66b Browse Files
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · d1124357
  Don Mitchell committed Jan 03, 2013
  
  d1124357 Browse Files