Commits · f6434ed4fb511b2f22f44f3660863b192c8cf9dd · edx / edx-platform · GitLab

10 Apr, 2013 8 commits
- Merge pull request #1840 from MITx/fix/cdodge/export-draft-modules · f6434ed4
```
Fix/cdodge/export draft modules
```
  Don Mitchell committed Apr 10, 2013
  f6434ed4 Browse Files
- Merge pull request #1842 from MITx/feature/christina/metadata · 4d9dd402
```
Get the "Edit High Level Source" link back in for LaTeX problems. Broken with xblock work.
```
  chrisndodge committed Apr 10, 2013
  4d9dd402 Browse Files
- Get the "Edit High Level Source" link back in. Broken with xblock work. · 40adfa95
```
https://edx.lighthouseapp.com/projects/102637-studio/tickets/273
```
  cahrens committed Apr 10, 2013
  40adfa95 Browse Files
- remove commented out code. Also fix up indents and other violations · 0a293731
  Chris Dodge committed Apr 10, 2013
  
  0a293731 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules · d9fa723e
```
Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
```
  Chris Dodge committed Apr 10, 2013
  d9fa723e Browse Files
- Merge pull request #1833 from MITx/feature/btalbot/studio-courselink · 276b86a7
```
Feature/btalbot/studio courselink
```
  Christina Roberts committed Apr 10, 2013
  276b86a7 Browse Files
- Merge branch 'master' into feature/btalbot/studio-courselink · 97e893b2
  Brian Talbot committed Apr 10, 2013
  
  97e893b2 Browse Files
- studio - revised course URL link label to match wording used elsewhere in the view/app · 01b2fefd
  Brian Talbot committed Apr 10, 2013
  
  01b2fefd Browse Files
09 Apr, 2013 5 commits
- Merge pull request #1832 from MITx/fix/btalbot/studio-contentmargin · 81f94fc4
```
studio - fixing a visual margin issue with the sign up/in views
```
  Christina Roberts committed Apr 09, 2013
  81f94fc4 Browse Files
- 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 27 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
- studio - course link final styling · 12784e3f
  Brian Talbot committed Apr 08, 2013
  
  12784e3f Browse Files
- studio - refining style and presentation of course link and invitation button on details settings · b51e57ed
  Brian Talbot committed Apr 08, 2013
  
  b51e57ed 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 - fixing a visual margin issue with the sign up/in views header/content areas · 606469cd
  Brian Talbot committed Apr 08, 2013
  
  606469cd 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
- studio - restyling course basic details and adding in a course's URL more prominently WIP · 4e331a2c
  Brian Talbot committed Apr 08, 2013
  
  4e331a2c 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 broken unit test · 4cbb9253
  Chris Dodge committed Apr 08, 2013
  
  4cbb9253 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules · d7b148d0
```
Conflicts:
	common/lib/xmodule/xmodule/modulestore/draft.py
```
  Chris Dodge committed Apr 08, 2013
  d7b148d0 Browse Files
- calling update_item implicitly already puts the data in definition.data, so we… · c12d265a
```
calling update_item implicitly already puts the data in definition.data, so we want to make sure we don't end up nesting definition.data.data
```
  Chris Dodge committed Apr 08, 2013
  c12d265a 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