Commits · f5d07b15216e27d7b745096903e33162a4080897 · edx / edx-platform · GitLab

15 Dec, 2012 3 commits
- just tickle a file to for build cms-master. I dont seem to have the rights to… · f5d07b15
```
just tickle a file to for build cms-master. I dont seem to have the rights to force a jenkins build.
```
  Chris Dodge committed Dec 15, 2012
  f5d07b15 Browse Files
- Merge pull request #1165 from MITx/bug/btalbot/pullrequest1160-untangling · 368abbe6
```
cms pull request 1160 - CSS resolutions
```
  chrisndodge committed Dec 15, 2012
  368abbe6 Browse Files
- cms pull request 1160 - brought back all css changes lost in this request - mostly overview related · 2ee48873
  Brian Talbot committed Dec 15, 2012
  
  2ee48873 Browse Files
14 Dec, 2012 26 commits
- Merge pull request #1163 from MITx/feature/christina/misc · 2a353068
```
Feature/christina/misc
```
  Don Mitchell committed Dec 14, 2012
  2a353068 Browse Files
- Merge pull request #1160 from MITx/feature/btalbot/cms-gradable · e57b5b14
```
Overview page allows user to specify grading policy per subsection
```
  Christina Roberts committed Dec 14, 2012
  e57b5b14 Browse Files
- Code review changes. · ac7b0334
  Don Mitchell committed Dec 14, 2012
  
  ac7b0334 Browse Files
- Merge pull request #1162 from MITx/fix/cdodge/security-holes · dbd9ac6e
```
add some permissions asserting
```
  Christina Roberts committed Dec 14, 2012
  dbd9ac6e Browse Files
- Merge pull request #1161 from MITx/bug/btalbot/cms-pagestext · 9d206287
```
pages - made intro text visible again and styled it some
```
  chrisndodge committed Dec 14, 2012
  9d206287 Browse Files
- Merge branch 'feature/cale/cms-master' into feature/christina/misc · e3b302f5
  cahrens committed Dec 14, 2012
  
  e3b302f5 Browse Files
- add some permissions asserting · ab9b2086
  Chris Dodge committed Dec 14, 2012
  
  ab9b2086 Browse Files
- Some JavaScript cleanup (also addresses Studio #60). · 808cf8c6
  cahrens committed Dec 14, 2012
  
  808cf8c6 Browse Files
- pages - made intro text visible again and styled it some · 7d1a08d4
  Brian Talbot committed Dec 14, 2012
  
  7d1a08d4 Browse Files
- Merge pull request #1159 from MITx/bug/btalbot/cms-tooltips · 795b38f0
```
tooltips - removed bad js reference and added in unit tooltips
```
  chrisndodge committed Dec 14, 2012
  795b38f0 Browse Files
- Remove ability to set gradability at the section level (commented out · 0b762fa3
```
until we decide the inheritance) 
Remove Policy from subsection editor
Commented out Graded as: _____ from subsection settings 
Fix menu dismissa
Fix ambiguous selection
```
  Don Mitchell committed Dec 14, 2012
  0b762fa3 Browse Files
- 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
- Gradable impl'd for overview page · 0fc16dff
  Don Mitchell committed Dec 14, 2012
  
  0fc16dff 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
- Merge branch 'feature/cale/cms-master' into feature/christina/misc · cd694608
  cahrens committed Dec 14, 2012
  
  cd694608 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
- Overview should be ready to test. · 6c64032f
  Don Mitchell committed Dec 14, 2012
  
  6c64032f 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 11 commits
- Don't save null about items to db as it chokes lms. · e2918c2d
  Don Mitchell committed Dec 13, 2012
  
  e2918c2d Browse Files
- Cache to debug other branch · e0849e8b
  Don Mitchell committed Dec 13, 2012
  
  e0849e8b 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