Commits · 1ce362de7d8fde1217ce597d74aeae823d79a63f · edx / edx-platform · GitLab

05 Apr, 2013 1 commit
- 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
04 Apr, 2013 31 commits
- Remove Project Manager job listing · 0c31cac3
```
Requested by Conrad via email
```
  Greg Price committed Apr 04, 2013
  0c31cac3 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
- 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
- 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
- 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
- Fix date on Stanford press release · d4986946
```
Lighthouse ticket [#328 state:resolved]
```
  Greg Price committed Apr 04, 2013
  d4986946 Browse Files
- Update jobs page · 32b8c593
```
Lighthouse ticket [#304 state:resolved]
```
  Greg Price committed Apr 04, 2013
  32b8c593 Browse Files
- Apply text and image changes reqeusted by UTAustinX · ffc12594
```
Lighthouse LMS tickets:
[#307 state:resolved]
[#310 state:resolved]
[#319 state:resolved]
[#322 state:resolved]
```
  Greg Price committed Apr 04, 2013
  ffc12594 Browse Files
- Tests to make sure that input_states have the correct keys · 02b7ab4f
```
and are not cross-pollinating
```
  Diana Huang committed Apr 04, 2013
  02b7ab4f Browse Files
- Merge pull request #1780 from MITx/feature/ichuang/staff-email-for-course-creation · 79677e92
```
email link for course creation request (in Studio)
```
  chrisndodge committed Apr 04, 2013
  79677e92 Browse Files
- Merge remote-tracking branch 'edx-mitx/master' into feature/ichuang/staff-email-for-course-creation · 2e852d16
```
Conflicts:
	cms/envs/common.py
```
  ichuang committed Apr 04, 2013
  2e852d16 Browse Files
- Merge pull request #1424 from MITx/feature/ichuang/fix-forum-management-commands · 72ce1af9
```
fix forum management commands (assign_default_role was moved)
```
  Calen Pennington committed Apr 04, 2013
  72ce1af9 Browse Files
- Merge pull request #1795 from MITx/feature/cale/use-open-source-xblock · 7f19d489
```
Migrate to the open source XBlock repo
```
  Calen Pennington committed Apr 04, 2013
  7f19d489 Browse Files
- Merge pull request #1805 from MITx/fix/brian/user-on-progress · b7c8a697
```
add user name and email to progress page
```
  brianhw committed Apr 04, 2013
  b7c8a697 Browse Files
- Merge pull request #1779 from MITx/feature/ichuang/studio-sort-my-courses · 0ff31adf
```
sort course index in studio my courses page
```
  chrisndodge committed Apr 04, 2013
  0ff31adf Browse Files
- add user name and email to progress page · d3e7739b
  Brian Wilson committed Apr 04, 2013
  
  d3e7739b Browse Files
- fixing image resolution for the stanford-university image · ea6174af
  John Jarvis committed Apr 04, 2013
  
  ea6174af Browse Files
- Merge pull request #1804 from MITx/fix/brian/remove-input-state-logging · 1b7e552d
```
add progress logging while running remove_input_state management command
```
  Will Daly committed Apr 04, 2013
  1b7e552d Browse Files
- add progress logging · 4c511c3c
  Brian Wilson committed Apr 04, 2013
  
  4c511c3c Browse Files
- Migrate to the open source XBlock repo · 039ccb83
  Calen Pennington committed Apr 04, 2013
  
  039ccb83 Browse Files
- Merge pull request #1797 from MITx/diana/fix-matlab-queueing-message · 8304e903
```
Matlab Unit Tests and Minor Bugfix
```
  Diana Huang committed Apr 04, 2013
  8304e903 Browse Files
- Merge pull request #1803 from MITx/fix/zoldak/pep8-psychometrics · fb14bedf
```
pep8 fixes for psychoanalyze and capa module
```
  Will Daly committed Apr 04, 2013
  fb14bedf Browse Files
- pep8 fixes for psychoanalyze and capa module · 22017ac2
  Jay Zoldak committed Apr 04, 2013
  
  22017ac2 Browse Files
- Merge pull request #1776 from MITx/feature/ichuang/psychometrics-fix · 1717782c
```
fix psychometrics to be compatible with new xblocks
```
  Piotr Mitros committed Apr 04, 2013
  1717782c Browse Files
03 Apr, 2013 8 commits
- renaming image · d2313d85
  John Jarvis committed Apr 03, 2013
  
  d2313d85 Browse Files
- adding a smaller stanford image · b2e8780f
  John Jarvis committed Apr 03, 2013
  
  b2e8780f Browse Files
- removing old logo · e8ee6616
  John Jarvis committed Apr 03, 2013
  
  e8ee6616 Browse Files
- dding stanford-univ logo · 6d78425a
  John Jarvis committed Apr 03, 2013
  
  6d78425a Browse Files
- changing stanford logo · 1c581835
  John Jarvis committed Apr 03, 2013
  
  1c581835 Browse Files
- Merge pull request #1801 from MITx/fix/btalbot/studio-outlinedates · 56d5f13b
```
Resolving display issues around outline release dates
```
  Christina Roberts committed Apr 03, 2013
  56d5f13b Browse Files
- university->logo · 71cfc444
  John Jarvis committed Apr 03, 2013
  
  71cfc444 Browse Files
- updating image link · 0c81329f
  John Jarvis committed Apr 03, 2013
  
  0c81329f Browse Files