Commits · 65768e813baa71ee078298edf7e6cbd418312bab · edx / edx-platform · GitLab

03 Apr, 2013 11 commits
- resolving local merge conflict · 65768e81
  Brian Talbot committed Apr 03, 2013
  
  65768e81 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
- studio - tweaking the depth/shadow on the help sock UI · 2b749b97
  Brian Talbot committed Apr 03, 2013
  
  2b749b97 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 13 commits
- 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
- Merge branch 'master' into feature/btalbot/studio-helpsock · bf82af9d
  Brian Talbot committed Apr 02, 2013
  
  bf82af9d Browse Files
- studio - revising design, interaction, and FED of help sock · 6952b8e6
  Brian Talbot committed Apr 02, 2013
  
  6952b8e6 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
- 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
- studio - reverting footer UI to existing · 8b9ecd93
  Brian Talbot committed Apr 02, 2013
  
  8b9ecd93 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
- studio - syncing up class naming conventions for icons · 6042f807
  Brian Talbot committed Apr 02, 2013
  
  6042f807 Browse Files
01 Apr, 2013 16 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
- studio - adding in content/links to studio sock · f07da92a
  Brian Talbot committed Apr 01, 2013
  
  f07da92a Browse Files
- resolving local merge · 769e2090
  Brian Talbot committed Apr 01, 2013
  
  769e2090 Browse Files
- studio - basic design, interaction, and content for static in-page help · 57e5eb68
  Brian Talbot committed Apr 01, 2013
  
  57e5eb68 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
- add instructions to idashboard for deleting state of non-problem xblocks · 5477d643
  ichuang committed Apr 01, 2013
  
  5477d643 Browse Files
- Merge pull request #1785 from MITx/fix/cdodge/xml_attribute-as-system-metadata · ebeee7a1
```
list xml_attributes (new field since xblock integration) as system metad...
```
  Christina Roberts committed Apr 01, 2013
  ebeee7a1 Browse Files
- Merge pull request #1790 from MITx/fix/cdodge/certificates-db-perf-optimization · b7fba98e
```
optimize db round trips, by getting the course descriptor outside of the...
```
  jarv committed Apr 01, 2013
  b7fba98e Browse Files
- Merge pull request #1791 from MITx/fix/brian/foldit-grading · 140ad8bf
```
when grading, check for always-regrade at the section level too
```
  Victor Shnayder committed Apr 01, 2013
  140ad8bf Browse Files
- when grading, check for always-regrade at the section level too · 1abfff22
  Brian Wilson committed Apr 01, 2013
  
  1abfff22 Browse Files
- Merge pull request #1763 from MITx/fix/brian/single_section_grading · ba7d29b3
```
modify AssignmentFormatGrader to act like a SingleSectionGrader on single sections
```
  Victor Shnayder committed Apr 01, 2013
  ba7d29b3 Browse Files
- Merge pull request #1789 from MITx/fix/will/chem_customresponse_bug · 53cf8aa7
```
Fix/will/chem customresponse bug
```
  Victor Shnayder committed Apr 01, 2013
  53cf8aa7 Browse Files
- optimize db round trips, by getting the course descriptor outside of the user loop · 8fef8307
  Chris Dodge committed Apr 01, 2013
  
  8fef8307 Browse Files
- Undid accidental commit of pylint fixes to responsetypes · 1cba122d
  Will Daly committed Apr 01, 2013
  
  1cba122d Browse Files
- CustomResponse now imports chem packages into the global · 87d8a56a
```
context for scripts to access.
This was removed accidentally during an earlier refactoring,
which caused customresponse to raise an exception for chem problems.
Unit tests verify the changes
```
  Will Daly committed Apr 01, 2013
  87d8a56a Browse Files