Commits · 42614c69b4cfc1c2477bcd7d43c23d361947c146 · edx / edx-platform · GitLab

04 Apr, 2013 16 commits
- Add space after comma. · 42614c69
  Diana Huang committed Apr 04, 2013
  
  42614c69 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
- 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 22 commits
- 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
- studio - resolved z-index issue with release date modal and JQUI timepicker +… · b0021e73
```
studio - resolved z-index issue with release date modal and JQUI timepicker + conslidated all vendor styling overrides/extensions
```
  Brian Talbot committed Apr 03, 2013
  b0021e73 Browse Files
- Need to mock datetime.datetime.utcnow. · f77aaec3
  cahrens committed Apr 03, 2013
  
  f77aaec3 Browse Files
- studio - revising outline layout per date changes and gradable status UI issue · eb6f2d8c
  Brian Talbot committed Apr 03, 2013
  
  eb6f2d8c Browse Files
- Set the queue_len more consistently. · 2230fe3c
  Diana Huang committed Apr 03, 2013
  
  2230fe3c Browse Files
- Merge pull request #1799 from MITx/fix/zoldak/terrain-pylint · 8cd11f4f
```
Fix some pylint errors in the lettuce terrain module
```
  Will Daly committed Apr 03, 2013
  8cd11f4f Browse Files
- Merge pull request #1798 from MITx/bug/christina/studio · 9a7324eb
```
Fix due date bug.
```
  Don Mitchell committed Apr 03, 2013
  9a7324eb Browse Files
- Fix some pylint errors in the lettuce terrain module · c9add70a
  Jay Zoldak committed Apr 03, 2013
  
  c9add70a Browse Files
- Make sure due date year is always in the past. · 52fdf5c7
  cahrens committed Apr 03, 2013
  
  52fdf5c7 Browse Files
- Fix the conditions by which we show the queueing message · 8cd4220b
```
for Matlab inputs
```
  Diana Huang committed Apr 03, 2013
  8cd4220b Browse Files
- Merge pull request #1770 from MITx/fix/brian/remove-input_state · 7c987587
```
management command to remove excess input_state entries
```
  brianhw committed Apr 03, 2013
  7c987587 Browse Files
- respond to feedback · b11f0e17
  Brian Wilson committed Apr 03, 2013
  
  b11f0e17 Browse Files
- Add new Matlab unit tests. · c658c651
  Diana Huang committed Apr 03, 2013
  
  c658c651 Browse Files
- Merge pull request #1757 from MITx/feature/markchang/studio-nps · c7c7f1da
```
added net promoter score tracking javascript shim from Qualaroo
```
  chrisndodge committed Apr 03, 2013
  c7c7f1da Browse Files
- Merge pull request #1796 from MITx/feature/vaxxxa/fix-caption-asset-path · 54d45bae
```
fix caption_asset_path for videoalpha
```
  chrisndodge committed Apr 03, 2013
  54d45bae Browse Files
- fix caption_asset_path for videoalpha · c66eabb3
  Vasyl Nakvasiuk committed Apr 03, 2013
  
  c66eabb3 Browse Files
- fixed merge on env · 1d70509d
  Mark L. Chang committed Apr 03, 2013
  
  1d70509d Browse Files
- Merge branch 'feature/markchang/studio-nps' of github.com:MITx/mitx into… · 565a2cf7
```
Merge branch 'feature/markchang/studio-nps' of github.com:MITx/mitx into feature/markchang/studio-nps
```
  Mark L. Chang committed Apr 03, 2013
  565a2cf7 Browse Files
- put survey behind MITX_FEATURES flag · 43f6f0ce
  Mark L. Chang committed Apr 03, 2013
  
  43f6f0ce Browse Files
- added net promoter score tracking javascript shim from Qualaroo · 5df7f41c
  Mark L. Chang committed Apr 03, 2013
  
  5df7f41c Browse Files
- put survey behind MITX_FEATURES flag · 7a57e369
  Mark L. Chang committed Apr 03, 2013
  
  7a57e369 Browse Files
- Merge pull request #1662 from MITx/feature/abarrett/annotation-styling-fixes · 67fecd3e
```
Annotation styling fixes
```
  Victor Shnayder committed Apr 02, 2013
  67fecd3e Browse Files
02 Apr, 2013 2 commits
- change command to handle file input instead · b6f95c71
  Brian Wilson committed Apr 02, 2013
  
  b6f95c71 Browse Files
- Merge pull request #1786 from MITx/feature/cdodge/add-no-inheritable-metadata-on-verticals-to-xlint · d68650b4
```
per Victor, one shouldn't change the default parameter to a function, si...
```
  chrisndodge committed Apr 02, 2013
  d68650b4 Browse Files