Code

Merge master into release-2.0#9400

Code

Merged

yuit merged 18 commits intorelease-2.0microsoft/TypeScript:release-2.0from mergeMasterTo2.0microsoft/TypeScript:mergeMasterTo2.0Copy head branch name to clipboardJun 28, 2016

+218-26

Commits

Commits on Jun 25, 2016

• Merge branch 'master' of https://github.com/Microsoft/TypeScript

  saschanaz

  committed
  6e415cc

  Copy full SHA for 6e415cc

• do not format comma/closeparen in jsxelement

  saschanaz

  committed
  9dfcb44

  Copy full SHA for 9dfcb44

Commits on Jun 26, 2016

• format jsx expression

  saschanaz

  committed
  378c6b5

  Copy full SHA for 378c6b5

Commits on Jun 27, 2016

• make rules optional

  saschanaz

  committed
  cbfbfe1

  Copy full SHA for cbfbfe1

• Remove upper boilerplate from issue template

  Show description for 0b6ba96
  RyanCavanaugh

  authored
  0b6ba96

  Copy full SHA for 0b6ba96

Commits on Jun 28, 2016

• Merge pull request #7075 from Microsoft/loadJsFromModules

  Show description for 8bf3d54
  billti

  authored
  8bf3d54

  Copy full SHA for 8bf3d54

• Update issue_template.md

  RyanCavanaugh

  authored
  8ddba28

  Copy full SHA for 8ddba28

• Merge pull request #9380 from Microsoft/update-template

  Show description for 6be7d9c
  RyanCavanaugh

  authored
  6be7d9c

  Copy full SHA for 6be7d9c

• Merge pull request #8 from Microsoft/master

  Show description for 3ea2cdd
  zspitz

  authored
  3ea2cdd

  Copy full SHA for 3ea2cdd

• new options should be optional for compatibility

  saschanaz

  committed
  6e984eb

  Copy full SHA for 6e984eb

• Add getCurrentDirectory to ServerHost

  zhengbli

  committed
  6ff91b8

  Copy full SHA for 6ff91b8

• Add nullchecks for typeRoots, remove getCurrentDirectory from ServerHost as it is always the installation location

  zhengbli

  committed
  d5cad23

  Copy full SHA for d5cad23

• Merge pull request #9361 from SaschaNaz/noFormatInJsxElement

  Show description for ec02077
  mhegazy

  authored
  ec02077

  Copy full SHA for ec02077

• VarDate interface and relevant Date.prototype members

  zspitz

  committed
  3fdaf19

  Copy full SHA for 3fdaf19

• Merge pull request #9393 from zspitz/MSActiveXExtensions

  Show description for a91978e
  mhegazy

  authored
  a91978e

  Copy full SHA for a91978e

• Merge pull request #9396 from zhengbli/fix9186

  Show description for 50177b1
  zhengbli

  authored
  50177b1

  Copy full SHA for 50177b1

• Fix 9363: Object destructuring broken-variables are bound to the wrong object (#9383)

  Show description for 29107e6
  yuit

  authored
  29107e6

  Copy full SHA for 29107e6

• Merge branch 'master' into mergeMasterTo2.0

  

  Kanchalai Tanglertsampan

  committed
  96fa0b8

  Copy full SHA for 96fa0b8