Commits · 05428f5b078f65aac856979e25950c2c2e85fad1 · edx / edx-platform · GitLab

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 8 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
- 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 23 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
- Numerical response template has markdown init · 63791b2a
  Don Mitchell committed Jan 03, 2013
  
  63791b2a Browse Files
- Starting the markdown editor. · b4312cbf
  cahrens committed Jan 03, 2013
  
  b4312cbf Browse Files
- Cache to swap branches · f3ba1573
  Don Mitchell committed Jan 03, 2013
  
  f3ba1573 Browse Files
- Don't show markdown if it doesn't exist. · e09a8e4a
  cahrens committed Jan 03, 2013
  
  e09a8e4a Browse Files
- Get buttons working again (with old behavior). · 1c886b33
  cahrens committed Jan 03, 2013
  
  1c886b33 Browse Files
- Merge branch 'feature/cas/speed-editor' of git@github.com:MITx/mitx.git into… · b5b11c69
```
Merge branch 'feature/cas/speed-editor' of git@github.com:MITx/mitx.git into feature/cas/speed-editor
```
  Don Mitchell committed Jan 03, 2013
  b5b11c69 Browse Files
- populate markdown into problem editor template · 47ca316d
  Don Mitchell committed Jan 03, 2013
  
  47ca316d Browse Files
- resolving further Sass conflicts within unit editing view styling · 439addc1
  Brian Talbot committed Jan 03, 2013
  
  439addc1 Browse Files
- resolving Sass issues caused by previous merge conflict resolution in branch · 7b757035
  Brian Talbot committed Jan 03, 2013
  
  7b757035 Browse Files
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · 68def8af
  cahrens committed Jan 03, 2013
  
  68def8af Browse Files
- More deletion · e60230dd
  cahrens committed Jan 03, 2013
  
  e60230dd Browse Files
- Placeholders for markdown editor js and reference to pull it in from · 4e9d5c8a
```
CapaDescriptor. Overrode XMLEditorDescription
```
  Don Mitchell committed Jan 03, 2013
  4e9d5c8a Browse Files
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · 702636c0
  Don Mitchell committed Jan 03, 2013
  
  702636c0 Browse Files
- Cache to pull CR's cleanup of branch · 31141299
  Don Mitchell committed Jan 03, 2013
  
  31141299 Browse Files
- Remove tiny_mce. · b91e85c0
  cahrens committed Jan 03, 2013
  
  b91e85c0 Browse Files
- Remove askbot. · e1b7a266
  cahrens committed Jan 03, 2013
  
  e1b7a266 Browse Files
02 Jan, 2013 5 commits
- Merge commit 'af908104' into feature/cas/speed-editor · 4f32d5f3
```
Conflicts:
	cms/static/sass/_assets.scss
	cms/static/sass/_base.scss
	cms/static/sass/_unit.scss
	cms/templates/unit.html
```
  Don Mitchell committed Jan 02, 2013
  4f32d5f3 Browse Files
- Merge pull request #1220 from MITx/fix/cdodge/handout-links · edd9b2bc
```
trigger another build
```
  chrisndodge committed Jan 02, 2013
  edd9b2bc Browse Files
- trigger another build · b5ccb4b8
  Chris Dodge committed Jan 02, 2013
  
  b5ccb4b8 Browse Files
- Merge pull request #1219 from MITx/fix/cdodge/handout-links · fa0fd4b5
```
another comment commit just to trigger a new build
```
  chrisndodge committed Jan 02, 2013
  fa0fd4b5 Browse Files
- another comment commit just to trigger a new build · d008cb9f
  Chris Dodge committed Jan 02, 2013
  
  d008cb9f Browse Files