Commits · cea0f9252c6401466d8f82351fe3999b78de1e29 · edx / edx-platform

08 Apr, 2013 14 commits
- 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
- 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
- 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
- studio - adding in ux-alerts view comment · c0bb3c96
  Brian Talbot committed Apr 08, 2013
  
  c0bb3c96 Browse Files
- studio - addressing pull request to merge to master feedback · a6c35fb2
  Brian Talbot committed Apr 08, 2013
  
  a6c35fb2 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 1 commit

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

committed Apr 07, 2013

28862059 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 24 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 branch 'master' into feature/btalbot/studio-alerts · 386f57ea
  Brian Talbot committed Apr 05, 2013
  
  386f57ea Browse Files
- resolving local merge with master and sprucing style and templates for merge with master · 512e4fe3
  Brian Talbot committed Apr 05, 2013
  
  512e4fe3 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
- Update tests for GMT, get Advanced Settings test to pass reliably. · fa319539
  cahrens committed Apr 05, 2013
  
  fa319539 Browse Files
- Merge pull request #1806 from MITx/feature/cdodge/integrity-check-mongo-course · f467d93f
```
Feature/cdodge/integrity check mongo course
```
  chrisndodge committed Apr 05, 2013
  f467d93f Browse Files
- Merge pull request #1802 from MITx/feature/markchang/studio-analytics · aba17a54
```
Instrument studio for analytics
```
  chrisndodge committed Apr 05, 2013
  aba17a54 Browse Files
- tweeks per Cale's feedback · 8e36197c
  Chris Dodge committed Apr 05, 2013
  
  8e36197c Browse Files
- Merge pull request #1778 from MITx/feature/ichuang/add-dump-grades-config-to-instructor-dashboard · 262050e4
```
add dump of description of grading configuration to instructor dashboard
```
  Calen Pennington committed Apr 05, 2013
  262050e4 Browse Files
- Merge pull request #1807 from MITx/hotfix/gprice/marketing-changes-20120404 · 1ce362de
```
Hotfix/gprice/marketing changes 20120404
```
  Calen Pennington committed Apr 05, 2013
  1ce362de Browse Files
- Show UTC at end of string. · 2ad3fce2
  cahrens committed Apr 05, 2013
  
  2ad3fce2 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/markchang/studio-analytics · 32bc4620
  Mark L. Chang committed Apr 04, 2013
  
  32bc4620 Browse Files
- added dummy analytics object · 28522568
  Mark L. Chang committed Apr 04, 2013
  
  28522568 Browse Files