Commits · d7b3f28d17dad4da327cbf1ef6ab5dacde3f5d72 · edx / edx-platform · GitLab

13 Dec, 2012 21 commits
- reworked add component steps · d7b3f28d
  Tom Giannattasio committed Dec 13, 2012
  
  d7b3f28d Browse Files
- pulled out component types from behind add component button · 66004aeb
  Tom Giannattasio committed Dec 13, 2012
  
  66004aeb Browse Files
- cleaned up subsection and unit page · 5b81d6b8
  Tom Giannattasio committed Dec 13, 2012
  
  5b81d6b8 Browse Files
- cleaned up editor styles; cleaned up static tabs page · 052b6f69
  Tom Giannattasio committed Dec 13, 2012
  
  052b6f69 Browse Files
- more defined header, new icons, cleaner static tabs page · 39a882e2
  Tom Giannattasio committed Dec 13, 2012
  
  39a882e2 Browse Files
- new header styles; collapse all button added to courseware · 95dfc730
  Tom Giannattasio committed Dec 13, 2012
  
  95dfc730 Browse Files
- style tweaks to tabs and static pages; key bindings for new user form · 8294b058
  Tom Giannattasio committed Dec 13, 2012
  
  8294b058 Browse Files
- tweaked body color and window styles; adjusting new buttons · 197ea332
  Tom Giannattasio committed Dec 13, 2012
  
  197ea332 Browse Files
- removed new course button on click to prevent multiple instantiations · 74ce3d22
  Tom Giannattasio committed Dec 13, 2012
  
  74ce3d22 Browse Files
- headers still funky, absolutely positioned to avoid bugs for now; removed public tag and grey style · 131f4751
  Tom Giannattasio committed Dec 13, 2012
  
  131f4751 Browse Files
- fixed long header bug · 128a402b
  Tom Giannattasio committed Dec 13, 2012
  
  128a402b Browse Files
- Merge pull request #1125 from MITx/feature/dhm/cms-settings · 6ab97b6f
```
Feature/dhm/cms settings
```
  chrisndodge committed Dec 13, 2012
  6ab97b6f Browse Files
- Add flag to turn template caching on/off (default to off) · 41ca47ed
  Don Mitchell committed Dec 13, 2012
  
  41ca47ed Browse Files
- Merge pull request #1141 from MITx/feature/christina/misc · 113c99e0
```
Try running xmodule Jasmine tests on Jenkins (again!).
```
  Christina Roberts committed Dec 13, 2012
  113c99e0 Browse Files
- Try running xmodule Jasmine tests on Jenkins (again!). · c4e86140
  Christina Roberts committed Dec 13, 2012
  
  c4e86140 Browse Files
- up the template caching version number to avoid stale caches since there's been… · 3421331f
```
up the template caching version number to avoid stale caches since there's been a change to the underscore templates
```
  Chris Dodge committed Dec 13, 2012
  3421331f Browse Files
- up the template caching version number to avoid stale caches since there's been… · fc8281d5
```
up the template caching version number to avoid stale caches since there's been a change to the underscore templates
```
  Chris Dodge committed Dec 13, 2012
  fc8281d5 Browse Files
- Merge pull request #1140 from MITx/fix/cdodge/remove-xmodule-jasmine-tests · aa2d376b
```
trying backing out the addition of the xmodule jasmine tests and see if ...
```
  chrisndodge committed Dec 12, 2012
  aa2d376b Browse Files
- trying backing out the addition of the xmodule jasmine tests and see if builds… · e0469c35
```
trying backing out the addition of the xmodule jasmine tests and see if builds start passing again on Jenkins
```
  Chris Dodge committed Dec 12, 2012
  e0469c35 Browse Files
- Merge pull request #1139 from MITx/fix/cdodge/code-mirror-on-course-info · 6e2159cb
```
more tweeks on CodeMirror. Also do a re-ordering of operations when crea...
```
  chrisndodge committed Dec 12, 2012
  6e2159cb Browse Files
- more tweeks on CodeMirror. Also do a re-ordering of operations when creating a… · 35317b06
```
more tweeks on CodeMirror. Also do a re-ordering of operations when creating a new Update, put the CodeMirror binding after the form has been inserted into the DOM. It appears to improve some rendering characteristics.
```
  Chris Dodge committed Dec 12, 2012
  35317b06 Browse Files
12 Dec, 2012 17 commits
- More merge repairs. Hopefully done. · e75f63e9
  Don Mitchell committed Dec 12, 2012
  
  e75f63e9 Browse Files
- Fix screwed up merge · ea6532ef
  Don Mitchell committed Dec 12, 2012
  
  ea6532ef Browse Files
- Merge pull request #1137 from MITx/fix/cdodge/code-mirror-on-course-info · da73fc77
```
call remove() on CodeMirror
```
  chrisndodge committed Dec 12, 2012
  da73fc77 Browse Files
- call remove() on CodeMirror · 84b08b5e
  Chris Dodge committed Dec 12, 2012
  
  84b08b5e Browse Files
- Merge pull request #1136 from MITx/feature/christina/misc · 98b09a15
```
Try running xmodule Jasmine tests on Jenkins.
```
  Calen Pennington committed Dec 12, 2012
  98b09a15 Browse Files
- Try running xmodule Jasmine tests on Jenkins. · 94ee5b88
  Christina Roberts committed Dec 12, 2012
  
  94ee5b88 Browse Files
- Merge pull request #1134 from MITx/fix/cdodge/code-mirror-on-course-info · d3de52e6
```
dispose of  when we close the editor
```
  chrisndodge committed Dec 12, 2012
  d3de52e6 Browse Files
- dispose of when we close the editor · 0c68ba8b
  Chris Dodge committed Dec 12, 2012
  
  0c68ba8b Browse Files
- Merge pull request #1133 from MITx/feature/christina/misc · 710d73a9
```
Feature/christina/misc
```
  chrisndodge committed Dec 12, 2012
  710d73a9 Browse Files
- Merge remote-tracking branch 'origin/feature/cale/cms-master' into feature/christina/misc · 2f55583e
  Christina Roberts committed Dec 12, 2012
  
  2f55583e Browse Files
- Bug fix for Lighthouse #22. · c87eb08b
```
html names are automatically converted to the symbols they describe.
```
  Christina Roberts committed Dec 12, 2012
  c87eb08b Browse Files
- Check for null dates before setting time in timepicker. · 71455f76
```
Remove syllabus as it's not instrumented.
```
  Don Mitchell committed Dec 12, 2012
  71455f76 Browse Files
- Python path bug · cd23c8f8
  Don Mitchell committed Dec 12, 2012
  
  cd23c8f8 Browse Files
- Somehow linked file disappeared again. · d1c0eb8f
  Don Mitchell committed Dec 12, 2012
  
  d1c0eb8f Browse Files
- Somehow linked file disappeared again. · bb31fb74
  Don Mitchell committed Dec 12, 2012
  
  bb31fb74 Browse Files
- Merge remote-tracking branch 'origin/feature/cale/cms-master' into · 04ea2c82
```
feature/dhm/cms-settings

Conflicts:
	cms/static/sass/_base.scss
```
  Don Mitchell committed Dec 12, 2012
  04ea2c82 Browse Files
- Time zone prompt change and tooltip · 056bad4c
```
CodeMirror on overview entry
```
  Don Mitchell committed Dec 12, 2012
  056bad4c Browse Files
11 Dec, 2012 2 commits
- Show the timezone and current time (on tooltip) · d7591bc0
  Don Mitchell committed Dec 11, 2012
  
  d7591bc0 Browse Files
- Giving up for now on unit tests which mock http posts · c4f4da5e
  Don Mitchell committed Dec 11, 2012
  
  c4f4da5e Browse Files