Commits · a6c35fb2ce94bd8f69031fb02d27bc934ef867f2 · edx / edx-platform · GitLab

08 Apr, 2013 1 commit
- studio - addressing pull request to merge to master feedback · a6c35fb2
  Brian Talbot committed Apr 08, 2013
  
  a6c35fb2 Browse Files
05 Apr, 2013 19 commits
- 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
- Remove duplicate entries from the press page. · 6937f24c
  Diana Huang committed Apr 05, 2013
  
  6937f24c Browse Files
- pylint/pep8 fixes · 02dfa09c
  Chris Dodge committed Apr 05, 2013
  
  02dfa09c 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
- 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
- fix syntax error in lms/djangoapps/instructor/views.py · 3b371c17
  ichuang committed Apr 05, 2013
  
  3b371c17 Browse Files
- use isinstance for grader check in lms/djangoapps/instructor/views.py · 8d770c1c
  ichuang committed Apr 05, 2013
  
  8d770c1c Browse Files
04 Apr, 2013 20 commits
- Remove Project Manager job listing · 0c31cac3
```
Requested by Conrad via email
```
  Greg Price committed Apr 04, 2013
  0c31cac3 Browse Files
- Merge branch 'master' into feature/btalbot/studio-alerts · 5f316b58
  Brian Talbot committed Apr 04, 2013
  
  5f316b58 Browse Files
- studio - minor design tweaks to alert/notification chrome · 530f9a87
  Brian Talbot committed Apr 04, 2013
  
  530f9a87 Browse Files
- studio - adding in view-based banners UI tweaks and removing global banner UI for now · 3c3a6e75
  Brian Talbot committed Apr 04, 2013
  
  3c3a6e75 Browse Files
- Merge pull request #1774 from MITx/feature/ichuang/conditional-def-msg · 9075e844
```
add default message to conditional
```
  Calen Pennington committed Apr 04, 2013
  9075e844 Browse Files
- Merge pull request #1808 from MITx/bug/christina/studio · de448137
```
Show course end date on course about page
```
  Christina Roberts committed Apr 04, 2013
  de448137 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/markchang/studio-analytics · 2e9bf4ac
```
Conflicts:
	cms/envs/common.py
```
  Mark L. Chang committed Apr 04, 2013
  2e9bf4ac Browse Files
- added a dummy key for segment.io so it doesn't ever fail · 10377bc4
  Mark L. Chang committed Apr 04, 2013
  
  10377bc4 Browse Files
- On course about page, display course end date if no about page HTML blog (end_date.html) exists. · 57343c7d
```
#224
```
  cahrens committed Apr 04, 2013
  57343c7d Browse Files
- studio - removing unused footer-height variable · 9ab5710a
  Brian Talbot committed Apr 04, 2013
  
  9ab5710a Browse Files
- On course about page, display course end date if no about page HTML blog (end_date.html) exists. · bd055ddc
```
#224
```
  cahrens committed Apr 04, 2013
  bd055ddc Browse Files
- Merge branch 'feature/btalbot/studio-helpsock' of github.com:MITx/mitx into… · 6d496674
```
Merge branch 'feature/btalbot/studio-helpsock' of github.com:MITx/mitx into feature/btalbot/studio-helpsock
```
  Brian Talbot committed Apr 04, 2013
  6d496674 Browse Files
- studio - syncing up hover color of sock control with other buttons · 8e67f63e
  Brian Talbot committed Apr 04, 2013
  
  8e67f63e Browse Files
- On course about page, display course end date if no about page HTML blog (end_date.html) exists. · d02dc37d
```
#224
```
  cahrens committed Apr 04, 2013
  d02dc37d Browse Files
- Merge pull request #1800 from MITx/hotfix/stanford-press-release · 5873721e
```
Stanford press release
```
  Calen Pennington committed Apr 04, 2013
  5873721e Browse Files
- Merge pull request #1792 from MITx/fix/ichuang/duplicate-entry-error · 99424a97
```
fix IntegrityError duplicate entry issue with module_data Scope.student_state update
```
  Calen Pennington committed Apr 04, 2013
  99424a97 Browse Files
- Merge pull request #1781 from MITx/feature/ichuang/xqueue-callback-url-cleanup · e97e8ce5
```
clean up xqueue callback url generation; allow override from settings
```
  Calen Pennington committed Apr 04, 2013
  e97e8ce5 Browse Files
- Merge pull request #1768 from MITx/fix/diana/input-state-tests · d9d151b3
```
Tests to make sure that input_states have the correct keys
```
  Diana Huang committed Apr 04, 2013
  d9d151b3 Browse Files
- Merge pull request #1775 from MITx/feature/ichuang/gitreload-fix · ff8dca94
```
fix lms migration to be compatible with xblock
```
  Calen Pennington committed Apr 04, 2013
  ff8dca94 Browse Files
- Add space after comma. · 42614c69
  Diana Huang committed Apr 04, 2013
  
  42614c69 Browse Files