Skip to content

Commit

Permalink
Merge with master
Browse files Browse the repository at this point in the history
  • Loading branch information
elizabethdinella committed Aug 9, 2018
1 parent e6c676e commit 8b17532
Show file tree
Hide file tree
Showing 4,952 changed files with 67,772 additions and 104,479 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/Bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ Please fill in the *entire* template below.
-->

<!-- Please try to reproduce the issue with `typescript@next`. It may have already been fixed. -->
**TypeScript Version:** 3.0.0-dev.201xxxxx
**TypeScript Version:** 3.1.0-dev.201xxxxx

<!-- Search terms you tried before logging this (so others can find this issue more easily) -->
**Search Terms:**
**Search Terms:**

**Code**

Expand All @@ -32,6 +32,6 @@ Please fill in the *entire* template below.

**Actual behavior:**

**Playground Link:** <!-- A link to a TypeScript Playground "Share" link which demonstrates this behavior -->
**Playground Link:** <!-- A link to a TypeScript Playground "Share" link which demonstrates this behavior -->

**Related Issues:** <!-- Did you find other bugs that looked similar? -->
22 changes: 20 additions & 2 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ Rostislav Galimsky <[email protected]>
Richard Knoll <[email protected]> Richard Knoll <[email protected]>
Richard Karmazín <[email protected]>
Rowan Wyborn <[email protected]>
Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]>
Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]>
Ryohei Ikegami <[email protected]>
Sarangan Rajamanickam <[email protected]>
Sébastien Arod <[email protected]>
Expand Down Expand Up @@ -340,4 +340,22 @@ EcoleKeine <[email protected]> # Ecole Keine
Khải <[email protected]>
rhysd <[email protected]> # @rhysd
Zen <[email protected]> Zzzen <[email protected]> # @Zzzen
bluelovers <[email protected]> # @bluelovers
bluelovers <[email protected]> # @bluelovers
Dan Freeman <[email protected]>
David Sherret <[email protected]>
David Staheli <[email protected]>
Elizabeth Dinella <[email protected]>
John Doe <[email protected]>
Kevin Gibbons <[email protected]>
Markus Johnsson <[email protected]>
Martin Probst <[email protected]>
Mateusz Burzyński <[email protected]>
Steven <[email protected]> # @styfle
Pi Lanningham <[email protected]>
Sam Bostock <[email protected]>
Vimal Raghubir <[email protected]>
Vyacheslav Pukhanov <[email protected]>
dangoo <[email protected]> # Daniel Gooss
krk <[email protected]> # Kerem Kat
micnic <[email protected]> # Nicu Micleușanu
rflorian <[email protected]> # @rflorian
2 changes: 2 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ Jakefile.js
.circleci
.vscode/
.parallelperf.json
.mailmap
test.config
package-lock.json
yarn.lock
.github/
CONTRIBUTING.md
TEST-results.xml
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ branches:
- release-2.7
- release-2.8
- release-2.9
- release-3.0

install:
- npm uninstall typescript --no-save
Expand Down
18 changes: 17 additions & 1 deletion AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,19 @@ TypeScript is authored by:
* Dafrok Zhang
* Dahan Gong
* Dan Corder
* Dan Freeman
* Dan Quirk
* Daniel Gooss
* Daniel Hollocher
* Daniel Król
* Daniel Lehenbauer
* Daniel Rosenwasser
* David Kmenta
* David Li
* David Sheldrick
* David Sherret
* David Souther
* David Staheli
* Denis Nedelyaev
* Derek P Sifford
* Dhruv Rajvanshi
Expand All @@ -96,6 +100,7 @@ TypeScript is authored by:
* @e-cloud
* Ecole Keine
* Elisée Maurer
* Elizabeth Dinella
* Emilio García-Pumarino
* Eric Grube
* Eric Tsang
Expand Down Expand Up @@ -161,6 +166,7 @@ TypeScript is authored by:
* Joel Day
* Joey Wilson
* Johannes Rieken
* John Doe
* John Vilk
* Jonathan Bond-Caron
* Jonathan Park
Expand All @@ -184,7 +190,9 @@ TypeScript is authored by:
* Keith Mashinter
* Ken Howard
* Kenji Imamula
* Kerem Kat
* Kevin Donnelly
* Kevin Gibbons
* Kevin Lang
* Khải
* Kitson Kelly
Expand All @@ -201,10 +209,13 @@ TypeScript is authored by:
* Manish Giri
* Marin Marinov
* Marius Schulz
* Markus Johnsson
* Martin Hiller
* Martin Probst
* Martin Vseticka
* Martyn Janes
* Masahiro Wakame
* Mateusz Burzyński
* Matt Bierner
* Matt McCutchen
* Matt Mitchell
Expand All @@ -223,10 +234,10 @@ TypeScript is authored by:
* Mohamed Hegazy
* Mohsen Azimi
* Myles Megyesi
* Natalie Coley
* Nathan Shively-Sanders
* Nathan Yee
* Nicolas Henry
* Nicu Micleușanu
* @nieltg
* Nima Zahedi
* Noah Chen
Expand All @@ -248,6 +259,7 @@ TypeScript is authored by:
* Peter Burns
* Philip Bulley
* Philippe Voinov
* Pi Lanningham
* Piero Cangianiello
* @piloopin
* Prayag Verma
Expand All @@ -270,6 +282,7 @@ TypeScript is authored by:
* Rowan Wyborn
* Ryan Cavanaugh
* Ryohei Ikegami
* Sam Bostock
* Sam El-Husseini
* Sarangan Rajamanickam
* Sean Barag
Expand All @@ -290,6 +303,7 @@ TypeScript is authored by:
* Stas Vilchik
* Stephan Ginthör
* Steve Lucco
* @styfle
* Sudheesh Singanamalla
* Sébastien Arod
* @T18970237136
Expand All @@ -316,8 +330,10 @@ TypeScript is authored by:
* Vidar Tonaas Fauske
* Viktor Zozulyak
* Vilic Vane
* Vimal Raghubir
* Vladimir Kurchatkin
* Vladimir Matveev
* Vyacheslav Pukhanov
* Wenlu Wang
* Wesley Wigham
* William Orr
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Design changes will not be accepted at this time. If you have a design change pr

You will need to complete a Contributor License Agreement (CLA). Briefly, this agreement testifies that you are granting us permission to use the submitted change according to the terms of the project's license, and that the work being submitted is under appropriate copyright.

Please submit a Contributor License Agreement (CLA) before submitting a pull request. You may visit https://cla.microsoft.com to sign digitally. Alternatively, download the agreement ([Microsoft Contribution License Agreement.docx](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=822190) or [Microsoft Contribution License Agreement.pdf](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=921298)), sign, scan, and email it back to <[email protected]>. Be sure to include your github user name along with the agreement. Once we have received the signed CLA, we'll review the request.
Please submit a Contributor License Agreement (CLA) before submitting a pull request. You may visit https://cla.microsoft.com to sign digitally. Alternatively, download the agreement ([Microsoft Contribution License Agreement.pdf](https://opensource.microsoft.com/pdf/microsoft-contribution-license-agreement.pdf)), sign, scan, and email it back to <[email protected]>. Be sure to include your github user name along with the agreement. Once we have received the signed CLA, we'll review the request.

## Housekeeping

Expand Down
Loading

0 comments on commit 8b17532

Please sign in to comment.