Commits · d2ed6e2c02963684ed7423044375f8d822fc5092 · edx / edx-platform · GitLab

09 Apr, 2013 4 commits
- Merge pull request #1830 from MITx/fix/cale/violations · d2ed6e2c
```
Clean up violations from ichuang's PR
```
  Ned Batchelder committed Apr 09, 2013
  d2ed6e2c Browse Files
- Merge pull request #1829 from MITx/marketing/cale/delftx-header · 5b8a410d
```
Marketing request: Lighthouse [#338, fixed]
```
  Calen Pennington committed Apr 09, 2013
  5b8a410d Browse Files
- Merge pull request #1834 from MITx/bug/christina/base · 2fce096e
```
Need to be able to access smoothScrollTop. 
```
  chrisndodge committed Apr 09, 2013
  2fce096e Browse Files
- Need to be able to access smoothScrollTop. This is a temporary change-- I'll… · f36494e5
```
Need to be able to access smoothScrollTop. This is a temporary change-- I'll come up with a proposal to namespace our helper functions in a nicer way.
```
  cahrens committed Apr 09, 2013
  f36494e5 Browse Files
08 Apr, 2013 36 commits
- Merge pull request #1831 from MITx/vik/fix/pg-and-progress · 74104d60
```
Fix weighting and score generation
```
  Sarina committed Apr 08, 2013
  74104d60 Browse Files
- Merge pull request #1816 from MITx/feature/btalbot/studio-alerts · 7fd8a33b
```
Feature/btalbot/studio-alerts
```
  Christina Roberts committed Apr 08, 2013
  7fd8a33b Browse Files
- studio - alerts: correcting page title · 78828457
  Brian Talbot committed Apr 08, 2013
  
  78828457 Browse Files
- studio - alerts: hiding alerts (in possbily inaccessible ways) in css for page load's sake · 27871ac9
  Brian Talbot committed Apr 08, 2013
  
  27871ac9 Browse Files
- Fix weighting and score generation · 7d09617e
  Vik Paruchuri committed Apr 08, 2013
  
  7d09617e Browse Files
- Merge pull request #1828 from MITx/fix/cdodge/import-nesting-definition-data · 45bb4d37
```
import was putting the xml data into definition.data.data rather than de...
```
  Calen Pennington committed Apr 08, 2013
  45bb4d37 Browse Files
- Merge branch 'master' into feature/btalbot/studio-alerts · 3f2e21f9
  Brian Talbot committed Apr 08, 2013
  
  3f2e21f9 Browse Files
- studio - alerts: adding some ARIA-centric accessibility information to example… · 3f22826e
```
studio - alerts: adding some ARIA-centric accessibility information to example prompts/notifications and advanced settings save notification
```
  Brian Talbot committed Apr 08, 2013
  3f22826e Browse Files
- seems like we need to purge 'filename' from both _model_data as well as xml_attributes · 54afc5eb
  Chris Dodge committed Apr 08, 2013
  
  54afc5eb Browse Files
- wip to fix broken test · a0f5a511
  Chris Dodge committed Apr 08, 2013
  
  a0f5a511 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/import-nesting-definition-data · 983e5241
  Chris Dodge committed Apr 08, 2013
  
  983e5241 Browse Files
- Clean up violations from ichuang's PR · 63b5153c
  Calen Pennington committed Apr 08, 2013
  
  63b5153c Browse Files
- fix line breaks per Cale · 0b26cc26
  Chris Dodge committed Apr 08, 2013
  
  0b26cc26 Browse Files
- Merge pull request #1823 from MITx/diana/job-page-update · e981226d
```
Make requested updates to the jobs page
```
  Diana Huang committed Apr 08, 2013
  e981226d Browse Files
- Marketing request: Lighthouse [#338, fixed] · 82882020
  Calen Pennington committed Apr 08, 2013
  
  82882020 Browse Files
- import was putting the xml data into definition.data.data rather than definition.data · 069f9975
  Chris Dodge committed Apr 08, 2013
  
  069f9975 Browse Files
- Merge pull request #1827 from MITx/fix/btalbot/studio-socktypo · 1500586f
```
studio - corrected a typo and adjusted copy on the help sock
```
  Mark L. Chang committed Apr 08, 2013
  1500586f Browse Files
- Merge pull request #1822 from MITx/fix/cdodge/add-more-container-types-to-inherit-through · 9a405ff4
```
extend the list of container module names to our comuputation of inherit...
```
  chrisndodge committed Apr 08, 2013
  9a405ff4 Browse Files
- studio - corrected a typo and adjusted copy on the help sock · e3a1279c
  Brian Talbot committed Apr 08, 2013
  
  e3a1279c Browse Files
- Merge pull request #1826 from MITx/fix/cdodge/dont-blowup-index-if-no-course-is-None · caa25398
```
mark stumble on case where he had a None course
```
  Mark L. Chang committed Apr 08, 2013
  caa25398 Browse Files
- mark stumble on case where he had a None course · 472e6576
  Chris Dodge committed Apr 08, 2013
  
  472e6576 Browse Files
- Merge pull request #1824 from MITx/feature/cdodge/improve-cms-test-coverage · c14d046d
```
add a simple Studio walkthough to check page loads
```
  Don Mitchell committed Apr 08, 2013
  c14d046d Browse Files
- add a simple Studio walkthough to check page loads · 5137119f
  Chris Dodge committed Apr 08, 2013
  
  5137119f Browse Files
- studio - alerts: removed banners as a design pattern (not using them) and… · bcf47756
```
studio - alerts: removed banners as a design pattern (not using them) and corrected advanced setting links and smoothscrolling
```
  Brian Talbot committed Apr 08, 2013
  bcf47756 Browse Files
- Make requested updates to the jobs page · b1716dc2
  Diana Huang committed Apr 08, 2013
  
  b1716dc2 Browse Files
- extend the list of container module names to our comuputation of inherited metadata · 7cd4310c
  Chris Dodge committed Apr 08, 2013
  
  7cd4310c Browse Files
- Merge branch 'master' into feature/btalbot/studio-alerts · c8cceb71
  Brian Talbot committed Apr 08, 2013
  
  c8cceb71 Browse Files
- studio - alerts: refactored some alert and notification show/hide js added back to base.js · 4d0d3d3a
  Brian Talbot committed Apr 08, 2013
  
  4d0d3d3a Browse Files
- studio - alerts: reducing the animation time for notification slide downs · 28334064
  Brian Talbot committed Apr 08, 2013
  
  28334064 Browse Files
- Merge pull request #1821 from MITx/fix/cdodge/student-to-user-name-change · 146f09b7
```
xblock changed attribute names from 'student' to 'user'. Need to update ...
```
  chrisndodge committed Apr 08, 2013
  146f09b7 Browse Files
- studio - alerts: adding back in manual close behavior to base.js (needed across app) · 4f71f538
  Brian Talbot committed Apr 08, 2013
  
  4f71f538 Browse Files
- Merge pull request #1819 from MITx/feature/ichuang/fix-edit-links-and-giturl · a57e0fa2
```
make "edit" links work - fixes giturl (was broken by xblocks migration)
```
  chrisndodge committed Apr 08, 2013
  a57e0fa2 Browse Files
- Make sure we don't mark the message bar as hiding if it is not shown. · cea0f925
  cahrens committed Apr 08, 2013
  
  cea0f925 Browse Files
- xblock changed attribute names from 'student' to 'user'. Need to update consumers · 0949754c
  Chris Dodge committed Apr 08, 2013
  
  0949754c Browse Files
- Merge branch 'master' into feature/btalbot/studio-alerts · 7f1c89b4
  cahrens committed Apr 08, 2013
  
  7f1c89b4 Browse Files
- Merge pull request #1818 from MITx/feature/ichuang/dump-grading-config-fix · 4b925520
```
fix typo in instructor dashboard dump grading config
```
  chrisndodge committed Apr 08, 2013
  4b925520 Browse Files