Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge master into release-2.0 #9400

Merged
merged 18 commits into from
Jun 28, 2016
Merged

Merge master into release-2.0 #9400

merged 18 commits into from
Jun 28, 2016

Commits on Jun 25, 2016

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

    @saschanaz
    saschanaz committed Jun 25, 2016
    Configuration menu
    Copy the full SHA
    6e415cc View commit details
    Browse the repository at this point in the history

  2. do not format comma/closeparen in jsxelement

    @saschanaz
    saschanaz committed Jun 25, 2016
    Configuration menu
    Copy the full SHA
    9dfcb44 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2016

  1. format jsx expression

    @saschanaz
    saschanaz committed Jun 26, 2016
    Configuration menu
    Copy the full SHA
    378c6b5 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2016

  1. make rules optional

    @saschanaz
    saschanaz committed Jun 27, 2016
    Configuration menu
    Copy the full SHA
    cbfbfe1 View commit details
    Browse the repository at this point in the history

  2. Remove upper boilerplate from issue template 

    Our issue stats did not improve appreciably when we added the issue template. Reduce upper boilerplate text and try to make it more action-oriented
    @RyanCavanaugh
    RyanCavanaugh authored Jun 27, 2016
    Configuration menu
    Copy the full SHA
    0b6ba96 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2016

  1. Merge pull request #7075 from Microsoft/loadJsFromModules 

    Load JavaScript modules from Node packages
    @billti
    billti authored Jun 28, 2016
    Configuration menu
    Copy the full SHA
    8bf3d54 View commit details
    Browse the repository at this point in the history

  2. Update issue_template.md

    @RyanCavanaugh
    RyanCavanaugh authored Jun 28, 2016
    Configuration menu
    Copy the full SHA
    8ddba28 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #9380 from Microsoft/update-template 

    Remove upper boilerplate from issue template
    @RyanCavanaugh
    RyanCavanaugh authored Jun 28, 2016
    Configuration menu
    Copy the full SHA
    6be7d9c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #8 from Microsoft/master 

    Merge master in MSActiveXExtensions
    @zspitz
    zspitz authored Jun 28, 2016
    Configuration menu
    Copy the full SHA
    3ea2cdd View commit details
    Browse the repository at this point in the history

  5. new options should be optional for compatibility

    @saschanaz
    saschanaz committed Jun 28, 2016
    Configuration menu
    Copy the full SHA
    6e984eb View commit details
    Browse the repository at this point in the history

  6. Add getCurrentDirectory to ServerHost

    @zhengbli
    zhengbli committed Jun 28, 2016
    Configuration menu
    Copy the full SHA
    6ff91b8 View commit details
    Browse the repository at this point in the history

  7. Add nullchecks for typeRoots, remove getCurrentDirectory from ServerH… 

    …ost as it is always the installation location
    @zhengbli
    zhengbli committed Jun 28, 2016
    Configuration menu
    Copy the full SHA
    d5cad23 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #9361 from SaschaNaz/noFormatInJsxElement 

    Fix formatting on JsxElement/JsxExpression
    @mhegazy
    mhegazy authored Jun 28, 2016
    Configuration menu
    Copy the full SHA
    ec02077 View commit details
    Browse the repository at this point in the history

  9. VarDate interface and relevant Date.prototype members

    @zspitz
    zspitz committed Jun 28, 2016
    Configuration menu
    Copy the full SHA
    3fdaf19 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #9393 from zspitz/MSActiveXExtensions 

    Ms active x extensions
    @mhegazy
    mhegazy authored Jun 28, 2016
    Configuration menu
    Copy the full SHA
    a91978e View commit details
    Browse the repository at this point in the history

  11. Merge pull request #9396 from zhengbli/fix9186 

    Check getCurrentDirectory availability in getEffectiveTypeRoots
    @zhengbli
    zhengbli authored Jun 28, 2016
    Configuration menu
    Copy the full SHA
    50177b1 View commit details
    Browse the repository at this point in the history

  12. Fix 9363: Object destructuring broken-variables are bound to the wron… 

    …g object (#9383)

* Fix emit incorrect destructuring mapping in var declaration

* Add tests and baselines

* Add additional tests and baselines
    @yuit
    yuit authored Jun 28, 2016
    Configuration menu
    Copy the full SHA
    29107e6 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' into mergeMasterTo2.0

    Kanchalai Tanglertsampan committed Jun 28, 2016
    Configuration menu
    Copy the full SHA
    96fa0b8 View commit details
    Browse the repository at this point in the history