Commits · 5493fd586a1545c56c7c6dee7389af89465980d3 · edx / edx-platform · GitLab

04 Jan, 2013 2 commits
- 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 7 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
- Merge pull request #1218 from MITx/bug/btalbot/editview-images · 94f396b9
```
studio - resolved overflowing images in unit editing
```
  Don Mitchell committed Jan 02, 2013
  94f396b9 Browse Files
- studio - resolved unit editing bug where larger images would overflow out of editing visual area · a5aafc42
  Brian Talbot committed Jan 02, 2013
  
  a5aafc42 Browse Files
28 Dec, 2012 8 commits
- Merge pull request #1215 from MITx/fix/cdodge/handout-links · a25021b6
```
basically force another build by adding a comment
```
  chrisndodge committed Dec 28, 2012
  a25021b6 Browse Files
- basically force another build by adding a comment · cf3df230
  Chris Dodge committed Dec 28, 2012
  
  cf3df230 Browse Files
- Merge pull request #1214 from MITx/fix/cdodge/handout-links · 3d6cbf47
```
add a comment. Namely we just want to trigger another build.
```
  chrisndodge committed Dec 28, 2012
  3d6cbf47 Browse Files
- add a comment. Namely we just want to trigger another build. · f3430527
  Chris Dodge committed Dec 28, 2012
  
  f3430527 Browse Files
- Merge pull request #1213 from MITx/fix/cdodge/handout-links · 4834ed35
```
add forgotten new file
```
  chrisndodge committed Dec 28, 2012
  4834ed35 Browse Files
- add forgotten new file · 725805f1
  Chris Dodge committed Dec 28, 2012
  
  725805f1 Browse Files
- Merge pull request #1212 from MITx/fix/cdodge/handout-links · cba888c6
```
Fix/cdodge/handout links
```
  Don Mitchell committed Dec 28, 2012
  cba888c6 Browse Files
- add unit test to make sure rewriting is occuring when querying the handouts · 6d20292a
  Chris Dodge committed Dec 28, 2012
  
  6d20292a Browse Files