Commits · 63b5153cde06c36f9b8011f66fe2cf16730198c1 · edx / edx-platform · GitLab

08 Apr, 2013 22 commits
- Clean up violations from ichuang's PR · 63b5153c
  Calen Pennington committed Apr 08, 2013
  
  63b5153c 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
- extend the list of container module names to our comuputation of inherited metadata · 7cd4310c
  Chris Dodge committed Apr 08, 2013
  
  7cd4310c 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
- 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
- xblock changed attribute names from 'student' to 'user'. Need to update consumers · 0949754c
  Chris Dodge committed Apr 08, 2013
  
  0949754c 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
- Merge pull request #1812 from MITx/feature/christina/gmt · c6bec6bc
```
Display UTC on the end of dates (that are in UTC).
```
  Don Mitchell committed Apr 08, 2013
  c6bec6bc Browse Files
- Merge pull request #1820 from MITx/fix/cdodge/draft-metadata-inheritance · 6e45db65
```
Fix/cdodge/draft metadata inheritance
```
  Don Mitchell committed Apr 08, 2013
  6e45db65 Browse Files
- pep8 · c4befa13
  cahrens committed Apr 08, 2013
  
  c4befa13 Browse Files
- Change display_timezone to show_timezone. · f0d2ff7b
  cahrens committed Apr 08, 2013
  
  f0d2ff7b Browse Files
- remove unsed import · 93e27c5f
  Chris Dodge committed Apr 08, 2013
  
  93e27c5f Browse Files
- remove unsed import · 9e240974
  Chris Dodge committed Apr 08, 2013
  
  9e240974 Browse Files
- revert changes to editable_metadata_fields(), so that we can't leave behavior… · 052fc5ad
```
revert changes to editable_metadata_fields(), so that we can't leave behavior 'as-is' for Christina's work
```
  Chris Dodge committed Apr 08, 2013
  052fc5ad Browse Files
- Add display_timezone so course authors can choose not to display timezones in LMS. · 2631452b
  cahrens committed Apr 08, 2013
  
  2631452b Browse Files
- Add display_timezone so course authors can choose not to display timezones in LMS. · e4dac6e3
  cahrens committed Apr 08, 2013
  
  e4dac6e3 Browse Files
07 Apr, 2013 4 commits
- get metadata inheritance to work with draft stores. Fix bug on .publish() method… · 28862059
```
get metadata inheritance to work with draft stores. Fix bug on .publish() method whereby inherited metadata got written to the DB as 'own-metadata'. Change filter in mako_module.py to return list of own-metadata and inherited-metadata as 'editable-metadata'. Also, add unit test for draft metadata-inheritance and publish
```
  Chris Dodge committed Apr 07, 2013
  28862059 Browse Files
- fix default giturl link · f88b5794
  ichuang committed Apr 07, 2013
  
  f88b5794 Browse Files
- not all modules have xml_attributes ; be careful about this in xmodule_modifier · d2768c64
  ichuang committed Apr 07, 2013
  
  d2768c64 Browse Files
- make "edit" links work - fixes giturl (was broken by xblocks migration) · 8cafadc0
```
Conflicts:

	lms/templates/staff_problem_info.html
	lms/xmodule_namespace.py
```
  ichuang committed Apr 07, 2013
  8cafadc0 Browse Files
06 Apr, 2013 1 commit
- fix typo in instructor dashboard dump grading config · 51d882b7
  ichuang committed Apr 06, 2013
  
  51d882b7 Browse Files
05 Apr, 2013 13 commits
- studio - resolving section release date form issues (labels, saving, updating) · f31588c8
  Brian Talbot committed Apr 05, 2013
  
  f31588c8 Browse Files
- studio - resolving margin-top issue with views that don't have a masthead · d41f5042
  Brian Talbot committed Apr 05, 2013
  
  d41f5042 Browse Files
- resolving local merge with master · 1a68d516
  Brian Talbot committed Apr 05, 2013
  
  1a68d516 Browse Files
- Merge pull request #1811 from MITx/fix/diana/press-page · f7094803
```
Remove duplicate entries from the press page.
```
  Diana Huang committed Apr 05, 2013
  f7094803 Browse Files
- Merge pull request #1809 from MITx/feature/btalbot/studio-helpsock · 33d39a85
```
Studio Help Sock
```
  Christina Roberts committed Apr 05, 2013
  33d39a85 Browse Files
- Merge pull request #1813 from MITx/fix/vik/pg-progress · aca6cdba
```
Fix pg progress
```
  Sarina committed Apr 05, 2013
  aca6cdba Browse Files
- Fix pg progress · 6aada791
  vik committed Apr 05, 2013
  
  6aada791 Browse Files
- Merge pull request #1810 from MITx/feature/cdodge/integrity-check-mongo-course · 4c95294b
```
pylint/pep8 fixes
```
  chrisndodge committed Apr 05, 2013
  4c95294b Browse Files
- studio - resolving help sock PR comments · 275826d4
  Brian Talbot committed Apr 05, 2013
  
  275826d4 Browse Files
- studio - adjusted abbr cursor displays · 4e8f01b8
  Brian Talbot committed Apr 05, 2013
  
  4e8f01b8 Browse Files
- Remove duplicate entries from the press page. · 6937f24c
  Diana Huang committed Apr 05, 2013
  
  6937f24c Browse Files
- studio - removing default styling for abbreviation elements, fixing typo in… · 7ff975e0
```
studio - removing default styling for abbreviation elements, fixing typo in title attribute for timepickers
```
  Brian Talbot committed Apr 05, 2013
  7ff975e0 Browse Files
- pylint/pep8 fixes · 02dfa09c
  Chris Dodge committed Apr 05, 2013
  
  02dfa09c Browse Files