Commits · 5709ee014b03e055cce3f1babf15b084ef00ccd2 · edx / edx-platform · GitLab

13 Dec, 2012 40 commits
- Merge pull request #1150 from MITx/bug/btalbot/cms-placeholdit · 5709ee01
```
bug - removed placeholdit image references in template HTML
```
  chrisndodge committed Dec 13, 2012
  5709ee01 Browse Files
- bug - removed placeholdit image references in template HTML · fb47f309
  Brian Talbot committed Dec 13, 2012
  
  fb47f309 Browse Files
- Merge pull request #1149 from MITx/style/studio/tom/ui-cleanups · 094856e2
```
Various Style/UI Tweaks
```
  chrisndodge committed Dec 13, 2012
  094856e2 Browse Files
- styling - re-aligned unit controls for unit editing and styled standard delete button · 59f1b1d1
  Brian Talbot committed Dec 13, 2012
  
  59f1b1d1 Browse Files
- styling - re-aligned unit edit controls and added visual divider · 15942aae
  Brian Talbot committed Dec 13, 2012
  
  15942aae Browse Files
- styling - settings UI tweaks · 25249929
  Brian Talbot committed Dec 13, 2012
  
  25249929 Browse Files
- styling - resolved FF top whitespace bug · 090e83b7
  Brian Talbot committed Dec 13, 2012
  
  090e83b7 Browse Files
- Merge pull request #1145 from MITx/feature/dhm/cms-settings · c182b8ef
```
Feature/dhm/cms settings
```
  Christina Roberts committed Dec 13, 2012
  c182b8ef Browse Files
- settings - debugged height issue with new/manipulated grade bars and moved… · f33efe3d
```
settings - debugged height issue with new/manipulated grade bars and moved solution back to CSS layer
```
  Brian Talbot committed Dec 13, 2012
  f33efe3d Browse Files
- settings - added in preventDefault() for all grading controls that needed it · 34441759
  Brian Talbot committed Dec 13, 2012
  
  34441759 Browse Files
- Merge pull request #1143 from MITx/feature/christina/misc · 62f54447
```
Protect against graceperiodjson being null.
```
  Don Mitchell committed Dec 13, 2012
  62f54447 Browse Files
- Protect against graceperiodjson being null. · e77a67a9
```
r.don
```
  cahrens committed Dec 13, 2012
  e77a67a9 Browse Files
- styling - settings layout and delete buttons · 6b176591
  Brian Talbot committed Dec 13, 2012
  
  6b176591 Browse Files
- styling - setting form field layout · 3b784f21
  Brian Talbot committed Dec 13, 2012
  
  3b784f21 Browse Files
- settings/style - general UI clean up - wip · 69c26a08
  Brian Talbot committed Dec 13, 2012
  
  69c26a08 Browse Files
- Merge branch 'feature/dhm/cms-settings' of github.com:MITx/mitx into feature/dhm/cms-settings · 9cc1b348
  Don Mitchell committed Dec 13, 2012
  
  9cc1b348 Browse Files
- Fix video string parse for empty and completely malformed strings · 9b9bdb44
  Don Mitchell committed Dec 13, 2012
  
  9b9bdb44 Browse Files
- resolving styling merge conflicts · 7d823d9e
  Brian Talbot committed Dec 13, 2012
  
  7d823d9e Browse Files
- styling - adjusting collapse button CSS lost in cms-master rebase · 9f863fd9
  Brian Talbot committed Dec 13, 2012
  
  9f863fd9 Browse Files
- Merge pull request #1142 from MITx/feature/dhm/cms-settings · aee4fd91
```
fix up some test failures
```
  chrisndodge committed Dec 13, 2012
  aee4fd91 Browse Files
- fix up some test failures · 4ebc9a58
  Chris Dodge committed Dec 13, 2012
  
  4ebc9a58 Browse Files
- clean up of users page · 2be1f852
  Tom Giannattasio committed Dec 13, 2012
  
  2be1f852 Browse Files
- added modal cover for editors · 75c49097
  Tom Giannattasio committed Dec 13, 2012
  
  75c49097 Browse Files
- 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