Commits · e4f4f32c1b8f2c3c1fb0957bbbcb4a25879744bc · edx / edx-platform · GitLab

14 Dec, 2012 12 commits
- tooltips - removed duplicate/incorrect tooltip_manager.js reference in base.html… · e4f4f32c
```
tooltips - removed duplicate/incorrect tooltip_manager.js reference in base.html and added tooltips to unit actions
```
  Brian Talbot committed Dec 14, 2012
  e4f4f32c Browse Files
- Merge pull request #1157 from MITx/bug/btalbot/cms-editingui · fbffe13d
```
Course Info and Settings Editor UI Bug Fixes
```
  chrisndodge committed Dec 14, 2012
  fbffe13d Browse Files
- Merge pull request #1156 from MITx/feature/christina/misc · ea384829
```
Bug fix for Studio #55.
```
  chrisndodge committed Dec 14, 2012
  ea384829 Browse Files
- cms settings - revised course overview textarea to display as codemirror field on page load · 4e152952
  Brian Talbot committed Dec 14, 2012
  
  4e152952 Browse Files
- Bug fix for Studio #55. · dd7ed956
  cahrens committed Dec 14, 2012
  
  dd7ed956 Browse Files
- editing UI - added in preventDefault() to all editing actions on course info · 91713cbe
  Brian Talbot committed Dec 14, 2012
  
  91713cbe Browse Files
- editing - revised unit editor styling · c7feaa13
  Brian Talbot committed Dec 14, 2012
  
  c7feaa13 Browse Files
- Merge pull request #1154 from MITx/feature/dhm/cms-settings · fef3fd87
```
Fixed 2nd fn which had regex infinite loop
```
  Christina Roberts committed Dec 14, 2012
  fef3fd87 Browse Files
- Fixed infinite loop in the 2nd video string parser which I'd fixed in · b9d9c7b8
```
the first yesterday. Fixed formatting of compounded video string errors.
```
  Don Mitchell committed Dec 14, 2012
  b9d9c7b8 Browse Files
- Fix infinite loop in videosourceSample. Had fixed same one in · 1eacd5e3
```
parse_videosource but neglected to fix this one.
```
  Don Mitchell committed Dec 14, 2012
  1eacd5e3 Browse Files
- Merge pull request #1135 from MITx/bug/btalbot/cms-tooltips · d965221e
```
debugged tooltip latency/vanishing issue
```
  chrisndodge committed Dec 14, 2012
  d965221e Browse Files
- Merge pull request #1152 from MITx/feature/dhm/cms-settings · f87e5cef
```
Don't save null about items to db as it chokes lms.
```
  chrisndodge committed Dec 13, 2012
  f87e5cef Browse Files
13 Dec, 2012 28 commits
- Don't save null about items to db as it chokes lms. · e2918c2d
  Don Mitchell committed Dec 13, 2012
  
  e2918c2d Browse Files
- add back the course info tab in the CMS · bb3b7cb3
  Chris Dodge committed Dec 13, 2012
  
  bb3b7cb3 Browse Files
- 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