Commits · 5f9d7db94d12fab47f1b6717e29a772d2c3ad435 · edx / edx-platform · GitLab

03 Apr, 2013 20 commits
- actually we need to start the draft content export from the sequentials. This is… · 5f9d7db9
```
actually we need to start the draft content export from the sequentials. This is because we need the child pointers to the draft verticals. For private items, if we don't do this, then we'll loose those pointers
```
  Chris Dodge committed Apr 03, 2013
  5f9d7db9 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules · a023cfa8
  Chris Dodge committed Apr 03, 2013
  
  a023cfa8 Browse Files
- wip: add test case for exporting/importing a private module · f7a83cdc
  Chris Dodge committed Apr 03, 2013
  
  f7a83cdc 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 tests and extend export/import unit test with draft testing. · 1a1635d4
  Chris Dodge committed Apr 03, 2013
  
  1a1635d4 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules · b61d7b2c
  Chris Dodge committed Apr 03, 2013
  
  b61d7b2c 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
- 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 17 commits
- change command to handle file input instead · b6f95c71
  Brian Wilson committed Apr 02, 2013
  
  b6f95c71 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules · 1d8f9c22
  Chris Dodge committed Apr 02, 2013
  
  1d8f9c22 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
- Remove string default value. · f802ac20
  cahrens committed Apr 02, 2013
  
  f802ac20 Browse Files
- fix up defaults per Victor's suggestions · b8f1b744
  Chris Dodge committed Apr 02, 2013
  
  b8f1b744 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into… · 61b40626
```
Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/add-no-inheritable-metadata-on-verticals-to-xlint
```
  Chris Dodge committed Apr 02, 2013
  61b40626 Browse Files
- wip · 1789814c
  Chris Dodge committed Apr 02, 2013
  
  1789814c Browse Files
- Feedback from code review. · 42fbc160
  cahrens committed Apr 02, 2013
  
  42fbc160 Browse Files
- Merge pull request #1794 from MITx/fix/cale/remove-pylint-line-length-check · 36c27377
```
Remove line length limit, because people were convoluting code to fix it
```
  Ned Batchelder committed Apr 02, 2013
  36c27377 Browse Files
- Remove line length limit, because people were convoluting code to fix it · b3851cc9
  Calen Pennington committed Apr 02, 2013
  
  b3851cc9 Browse Files
- Merge pull request #1793 from MITx/fix/btalbot/studio-headerwidth · 6ae26adf
```
studio - resolving broken nav element width in smaller windows
```
  Christina Roberts committed Apr 02, 2013
  6ae26adf Browse Files
- Merge branch 'master' into feature/markchang/studio-nps · 84a16f5c
  Mark L. Chang committed Apr 02, 2013
  
  84a16f5c Browse Files
- Merge pull request #1695 from MITx/jmclaus/genex-save-state · 17fa312b
```
Genex now saves its state
```
  John Hess committed Apr 02, 2013
  17fa312b Browse Files
- studio - resolving broken nav width · 899714a3
  Brian Talbot committed Apr 02, 2013
  
  899714a3 Browse Files
- Minor cleanup. · ceababbf
  cahrens committed Apr 02, 2013
  
  ceababbf Browse Files
- Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules · 63085ec6
  Chris Dodge committed Apr 02, 2013
  
  63085ec6 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules · 3727edab
```
Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/modulestore/draft.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	common/lib/xmodule/xmodule/xml_module.py
```
  Chris Dodge committed Apr 02, 2013
  3727edab Browse Files
01 Apr, 2013 3 commits
- Merge pull request #1782 from MITx/feature/ichuang/allow-reset-of-openended-problems · c5869c76
```
allow student state of module other than problem to be reset by instructor
```
  Victor Shnayder committed Apr 01, 2013
  c5869c76 Browse Files
- Merge pull request #1765 from MITx/feature/btalbot/studio-tenderwidget · ac180ca2
```
Adding in reference and UI for Tender discussion submission widget
```
  Christina Roberts committed Apr 01, 2013
  ac180ca2 Browse Files
- Merge pull request #1783 from MITx/bug/btalbot/studio-datepickerzindex · a8592b74
```
Studio - JQUI's default date picker z-index bug
```
  Christina Roberts committed Apr 01, 2013
  a8592b74 Browse Files