Commits · b704645f9978561e41b10b65670791b0ddfadc3c · edx / edx-platform · GitLab

09 Jan, 2013 4 commits
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · b704645f
  cahrens committed Jan 09, 2013
  
  b704645f Browse Files
- Warn user when going to XML Editor. Cleanup and comments. · b9795596
  cahrens committed Jan 09, 2013
  
  b9795596 Browse Files
- studio - resolving merge conflict with cms/templates/unit.html · 2a1e102f
  Brian Talbot committed Jan 09, 2013
  
  2a1e102f Browse Files
- studio - problem speed editor: tweaking presentation of problem sub menu further · f60a9d8d
  Brian Talbot committed Jan 09, 2013
  
  f60a9d8d Browse Files
08 Jan, 2013 9 commits
- studio - problem speed editor: revised html and DOM for problem sub menu · 75447eb8
  Brian Talbot committed Jan 08, 2013
  
  75447eb8 Browse Files
- Delete speed-editor.js and cruft from unit.html. · c7feee5b
  cahrens committed Jan 08, 2013
  
  c7feee5b Browse Files
- Fix formatting. · 4ac15daf
  cahrens committed Jan 08, 2013
  
  4ac15daf Browse Files
- Merge in Don's change. · 94696786
  cahrens committed Jan 08, 2013
  
  94696786 Browse Files
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · f616aecd
```
Conflicts:
	common/lib/xmodule/xmodule/js/src/problem/edit.coffee
```
  cahrens committed Jan 08, 2013
  f616aecd Browse Files
- Save work · bc10d080
  cahrens committed Jan 08, 2013
  
  bc10d080 Browse Files
- CapaDescriptor new unit tests · ae4e7815
  Don Mitchell committed Jan 08, 2013
  
  ae4e7815 Browse Files
- Added is_empty to model presented to unit.html · 6e2b4a07
  Don Mitchell committed Jan 08, 2013
  
  6e2b4a07 Browse Files
- Empty template now recognized as allowing markdown editing · 76f2ef6f
```
Save saves markdown and updates the xml
```
  Don Mitchell committed Jan 08, 2013
  76f2ef6f Browse Files
07 Jan, 2013 21 commits
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · 735aa134
  Don Mitchell committed Jan 07, 2013
  
  735aa134 Browse Files
- xml conversion unit tests plus a fix to the conversion which they · e46a76da
```
brought to light
```
  Don Mitchell committed Jan 07, 2013
  e46a76da Browse Files
- 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 2 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