Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 8648239

Browse filesBrowse files
author
zhengbli
committed
Merge branch 'master' of https://github.com/Microsoft/TypeScript into 11116
2 parents 536d703 + b82fe52 commit 8648239
Copy full SHA for 8648239

2,508 files changed

+255,038-169,980Lines changed: 255038 additions & 169980 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎.gitignore‎

Copy file name to clipboardExpand all lines: .gitignore
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ tests/cases/**/*.js.map
4141
scripts/debug.bat
4242
scripts/run.bat
4343
scripts/word2md.js
44+
scripts/buildProtocol.js
4445
scripts/ior.js
46+
scripts/buildProtocol.js
4547
scripts/*.js.map
4648
scripts/typings/
4749
coverage/
Collapse file

‎.mailmap‎

Copy file name to clipboardExpand all lines: .mailmap
+77-7Lines changed: 77 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,38 @@
11

2-
Alexander <alexander@kuvaev.me># Alexander Kuvaev
32
AbubakerB <abubaker_bashir@hotmail.com> # Abubaker Bashir
3+
Alexander <alexander@kuvaev.me># Alexander Kuvaev
44
Adam Freidin <adam.freidin@gmail.com> Adam Freidin <afreidin@adobe.com>
55
Adi Dahiya <adahiya@palantir.com> Adi Dahiya <adi.dahiya14@gmail.com>
66
Ahmad Farid <ahfarid@microsoft.com> ahmad-farid <ahfarid@microsoft.com>
7+
Alexander Rusakov <a_s_rusakov@mail.ru>
78
Alex Eagle <alexeagle@google.com>
9+
Anatoly Ressin <anatoly.ressin@icloud.com>
810
Anders Hejlsberg <andersh@microsoft.com> unknown <andersh@AndersX1.NOE.Nokia.com> unknown <andersh@andersh-yoga.redmond.corp.microsoft.com>
11+
Andrej Baran <andrej.baran@gmail.com>
912
Andrew Z Allen <me@andrewzallen.com>
1013
Andy Hanson <anhans@microsoft.com> Andy <anhans@microsoft.com>
1114
Anil Anar <anilanar@hotmail.com>
1215
Anton Tolmachev <myste@mail.ru>
1316
Arnavion <arnavion@gmail.com> # Arnav Singh
14-
Arthur Ozga <aozgaa@umich.edu> Arthur Ozga <t-arthoz@microsoft.com>
17+
Arthur Ozga <aozgaa@umich.edu> Arthur Ozga <t-arthoz@microsoft.com> Arthur Ozga <aozgaa-ms@outlook.com> Arthur Ozga <aozgaa@users.noreply.github.com> Arthur Ozga <arozga@microsoft.com>
1518
Asad Saeeduddin <masaeedu@gmail.com>
1619
Schmavery <avery.schmavery@gmail.com> # Avery Morin
1720
Basarat Ali Syed <basaratali@gmail.com> Basarat Syed <basaratali@gmail.com> basarat <basaratali@gmail.com>
1821
Bill Ticehurst <billti@hotmail.com> Bill Ticehurst <billti@microsoft.com>
1922
Ben Duffield <jebavarde@gmail.com>
23+
Ben Mosher <me@benmosher.com>
2024
Blake Embrey <hello@blakeembrey.com>
2125
Bowden Kelly <wilkelly@microsoft.com>
2226
Brett Mayen <bmayen@midnightsnacks.net>
2327
Bryan Forbes <bryan@reigndropsfall.net>
2428
Caitlin Potter <caitpotter88@gmail.com>
2529
ChrisBubernak <chris.bubernak@gmail.com> unknown <chrbub@chrbub1.redmond.corp.microsoft.com> # Chris Bubernak
30+
Christophe Vidal <kriss@krizalys.com>
2631
Chuck Jazdzewski <chuckj@google.com>
2732
Colby Russell <mr@colbyrussell.com>
2833
Colin Snover <github.com@zetafleet.com>
2934
Cyrus Najmabadi <cyrusn@microsoft.com> CyrusNajmabadi <cyrusn@microsoft.com> unknown <cyrusn@cylap.ntdev.corp.microsoft.com>
35+
Dafrok <o.o@mug.dog> # Dafrok Zhang
3036
Dan Corder <dev@dancorder.com>
3137
Dan Quirk <danquirk@microsoft.com> Dan Quirk <danquirk@users.noreply.github.com> nknown <danquirk@DANQUIRK1.redmond.corp.microsoft.com>
3238
Daniel Rosenwasser <drosen@microsoft.com> Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com> Daniel Rosenwasser <DanielRosenwasser@gmail.com> Daniel Rosenwasser <Daniel.Rosenwasser@microsoft.com> Daniel Rosenwasser <DanielRosenwasser@microsoft.com>
@@ -36,17 +42,22 @@ Denis Nedelyaev <denvned@gmail.com>
3642
Dick van den Brink <d_vandenbrink@outlook.com> unknown <d_vandenbrink@outlook.com> unknown <d_vandenbrink@live.com>
3743
Dirk Baeumer <dirkb@microsoft.com> Dirk Bäumer <dirkb@microsoft.com> # Dirk Bäumer
3844
Dirk Holtwick <dirk.holtwick@gmail.com>
45+
Dom Chen <domchen@users.noreply.github.com>
3946
Doug Ilijev <dilijev@users.noreply.github.com>
4047
Erik Edrosa <erik.edrosa@gmail.com>
48+
erictsangx <erictsangx@gmail.com> # Eric Tsang
4149
Ethan Rubio <ethanrubio@users.noreply.github.com>
4250
Evan Martin <martine@danga.com>
4351
Evan Sebastian <evanlhoini@gmail.com>
4452
Eyas <eyas.sharaiha@gmail.com> # Eyas Sharaiha
53+
Fabian Cook <faybecook@gmail.com>
4554
falsandtru <falsandtru@users.noreply.github.com> # @falsandtru
4655
Frank Wallis <fwallis@outlook.com>
47-
František Žiačik <fziacik@gratex.com> František Žiačik <ziacik@gmail.com>
56+
František Žiacik <fziacik@gratex.com> František Žiacik <ziacik@gmail.com>
57+
Gabe Moothart <gmoothart@gmail.com>
4858
Gabriel Isenberg <gisenberg@gmail.com>
4959
Gilad Peleg <giladp007@gmail.com>
60+
Godfrey Chan <godfreykfc@gmail.com>
5061
Graeme Wicksted <graeme.wicksted@gmail.com>
5162
Guillaume Salles <guillaume.salles@me.com>
5263
Guy Bedford <guybedford@gmail.com> guybedford <guybedford@gmail.com>
@@ -55,6 +66,7 @@ Iain Monro <iain.monro@softwire.com>
5566
Ingvar Stepanyan <me@rreverser.com>
5667
impinball <impinball@gmail.com> # Isiah Meadows
5768
Ivo Gabe de Wolff <ivogabe@ivogabe.nl>
69+
Jakub Młokosiewicz <hckr@users.noreply.github.com>
5870
James Whitney <james@whitney.io>
5971
Jason Freeman <jfreeman@microsoft.com> Jason Freeman <JsonFreeman@users.noreply.github.com>
6072
Jason Killian <jkillian@palantir.com>
@@ -69,11 +81,14 @@ Jonathan Park <jpark@daptiv.com>
6981
Jonathan Turner <jont@microsoft.com> Jonathan Turner <probata@hotmail.com>
7082
Jonathan Toland <toland@dnalot.com>
7183
Jesse Schalken <me@jesseschalken.com>
84+
Josh Abernathy <joshaber@gmail.com> joshaber <joshaber@gmail.com>
7285
Josh Kalderimis <josh.kalderimis@gmail.com>
7386
Josh Soref <jsoref@users.noreply.github.com>
7487
Juan Luis Boya García <ntrrgc@gmail.com>
7588
Julian Williams <julianjw92@gmail.com>
76-
Herrington Darkholme <nonamesheep1@gmail.com>
89+
Justin Bay <justin.bay@outlook.com>
90+
Justin Johansson <thebabellion@gmail.com>
91+
Herrington Darkholme <nonamesheep1@gmail.com> (´·?·`) <HerringtonDarkholme@users.noreply.github.com> # Herrington Darkholme
7792
Kagami Sascha Rosylight <saschanaz@outlook.com> SaschaNaz <saschanaz@outlook.com>
7893
Kanchalai Tanglertsampan <yuisu@microsoft.com> Yui <yuit@users.noreply.github.com>
7994
Kanchalai Tanglertsampan <yuisu@microsoft.com> Yui T <yuisu@microsoft.com>
@@ -82,23 +97,29 @@ Kanchalai Tanglertsampan <yuisu@microsoft.com> Yui <yuisu@microsoft.com>
8297
Kanchalai Tanglertsampan <yuisu@microsoft.com> yui T <yuisu@microsoft.com>
8398
Keith Mashinter <kmashint@yahoo.com> kmashint <kmashint@yahoo.com>
8499
Ken Howard <ken@simplicatedweb.com>
100+
Kevin Lang <klang2012@gmail.com>
85101
kimamula <kenji.imamula@gmail.com> # Kenji Imamula
86102
Kyle Kelley <rgbkrk@gmail.com>
87103
Lorant Pinter <lorant.pinter@prezi.com>
88104
Lucien Greathouse <me@lpghatguy.com>
105+
Lukas Elmer <lukas.elmer@gmail.com> Lukas Elmer <lukas.elmer@renuo.ch>
89106
Martin Vseticka <vseticka.martin@gmail.com> Martin Všeticka <vseticka.martin@gmail.com> MartyIX <vseticka.martin@gmail.com>
107+
gcnew <gcnew@abv.bg> # Marin Marinov
90108
vvakame <vvakame+dev@gmail.com> # Masahiro Wakame
91109
Matt McCutchen <rmccutch@mit.edu>
92110
Max Deepfield <maxdeepfield@absolutefreakout.com>
93111
Micah Zoltu <micah@zoltu.net>
112+
Michael <maykelchiche@gmail.com>
94113
Mohamed Hegazy <mhegazy@microsoft.com>
95114
Nathan Shively-Sanders <nathansa@microsoft.com>
96115
Nathan Yee <ny.nathan.yee@gmail.com>
97116
Nima Zahedi <nima.zahedee@gmail.com>
117+
Noah Chen <nchen@palantir.com>
98118
Noj Vek <nojvek@gmail.com>
99119
mihailik <mihailik@gmail.com> # Oleg Mihailik
100120
Oleksandr Chekhovskyi <oleksandr.chekhovskyi@hansoft.com>
101121
Paul van Brenk <paul.van.brenk@microsoft.com> Paul van Brenk <paul.van.brenk@outlook.com> unknown <paul.van.brenk@microsoft.com> unknown <paul.van.brenk@microsoft.com> unknown <pvanbren@pvbvsproai.redmond.corp.microsoft.com>
122+
Omer Sheikh <ojsheikh@gmail.com>
102123
Oskar Segersva¨rd <oskar.segersvard@widespace.com>
103124
pcan <piero.cangianiello@gmail.com> # Piero Cangianiello
104125
pcbro <2bux89+dk3zspjmuh16o@sharklasers.com> # @pcbro
@@ -109,21 +130,26 @@ progre <djyayutto@gmail.com> # @progre
109130
Prayag Verma <prayag.verma@gmail.com>
110131
Punya Biswal <pbiswal@palantir.com>
111132
Rado Kirov <radokirov@google.com>
112-
Ron Buckton <rbuckton@microsoft.com> Ron Buckton <ron.buckton@microsoft.com>
133+
Ron Buckton <rbuckton@microsoft.com> Ron Buckton <ron.buckton@microsoft.com> rbuckton <rbuckton@chronicles.org>
134+
Rostislav Galimsky <rostgal@gmail.com>
113135
Richard Knoll <riknoll@users.noreply.github.com> Richard Knoll <riknoll@microsoft.com>
114136
Rowan Wyborn <rwyborn@internode.on.net>
115137
Ryan Cavanaugh <RyanCavanaugh@users.noreply.github.com> Ryan Cavanaugh <ryan.cavanaugh@microsoft.com> Ryan Cavanaugh <ryanca@microsoft.com>
116138
Ryohei Ikegami <iofg2100@gmail.com>
117139
Sarangan Rajamanickam <sarajama@microsoft.com>
118140
Sébastien Arod <sebastien.arod@gmail.com>
141+
Sergey Shandar <sergey-shandar@users.noreply.github.com>
119142
Sheetal Nandi <shkamat@microsoft.com>
120143
Shengping Zhong <zhongsp@users.noreply.github.com>
121144
shyyko.serhiy@gmail.com <shyyko.serhiy@gmail.com> # Shyyko Serhiy
145+
Sam El-Husseini <samelh@microsoft.com>
122146
Simon Hürlimann <simon.huerlimann@cyt.ch>
147+
Slawomir Sadziak <slsadzia@microsoft.com>
123148
Solal Pirelli <solal.pirelli@gmail.com>
124149
Stan Thomas <stmsdn@norvil.net>
125150
Stanislav Sysoev <d4rkr00t@gmail.com>
126151
Steve Lucco <steveluc@users.noreply.github.com> steveluc <steveluc@microsoft.com>
152+
Sudheesh Singanamalla <sudheesh1995@outlook.com>
127153
Tarik <tarik@pushmote.com> # Tarik Ozket
128154
Tetsuharu OHZEKI <saneyuki.snyk@gmail.com> # Tetsuharu Ohzeki
129155
Tien Nguyen <tihoanh@microsoft.com> tien <hoanhtien@users.noreply.github.com> unknown <tihoanh@microsoft.com> #Tien Hoanhtien
@@ -133,14 +159,58 @@ Tingan Ho <tingan87@gmail.com>
133159
togru <v3nomzxgt8@gmail.com> # togru
134160
Tomas Grubliauskas <tgrubliauskas@gmail.com>
135161
ToddThomson <achilles@telus.net> # Todd Thomson
162+
Torben Fitschen <torben.fitschen@mayflower.de>
136163
TruongSinh Tran-Nguyen <i@truongsinh.pro>
137164
vilicvane <i@vilic.info> # Vilic Vane
138165
Vladimir Matveev <vladima@microsoft.com> vladima <vladima@microsoft.com> v2m <desco.by@gmail.com>
139166
Wesley Wigham <t-weswig@microsoft.com> Wesley Wigham <wwigham@gmail.com>
140167
York Yao <plantain-00@users.noreply.github.com> york yao <yaoao12306@outlook.com> yaoyao <yaoyao12306@163.com>
141168
Yuichi Nukiyama <oscar.wilde84@hotmail.co.jp> YuichiNukiyama <oscar.wilde84@hotmail.co.jp>
142169
Zev Spitz <shivisi@etrog.net.il>
143-
Zhengbo Li <zhengbli@microsoft.com> zhengbli <zhengbli@microsoft.com> Zhengbo Li <Zhengbo Li> Zhengbo Li <zhengbli@mirosoft.com> tinza123 <li.zhengbo@outlook.com> unknown <zhengbli@zhengblit430.redmond.corp.microsoft.com> Zhengbo Li <Zhengbo Li>
170+
Zhengbo Li <zhengbli@microsoft.com> zhengbli <zhengbli@microsoft.com> Zhengbo Li <Zhengbo Li> Zhengbo Li <zhengbli@mirosoft.com> tinza123 <li.zhengbo@outlook.com> unknown <zhengbli@zhengblit430.redmond.corp.microsoft.com> Zhengbo Li <Zhengbo Li> zhengbli <zhengli@microsoft.com>
144171
zhongsp <patrick.zhongsp@gmail.com> # Patrick Zhong
145172
T18970237136 <T18970237136@users.noreply.github.com> # @T18970237136
146-
JBerger <JBerger@melco.com>
173+
JBerger <JBerger@melco.com>
174+
bootstraponline <code@bootstraponline.com> # @bootstraponline
175+
yortus <yortus@gmail.com> # @yortus
176+
András Parditka <andraaspar@gmail.com>
177+
Anton Khlynovskiy <subzey@gmail.com>
178+
Charly POLY <cpoly55@gmail.com>
179+
Cotton Hou <himcotton@gmail.com>
180+
Ethan Resnick <ethan.resnick@gmail.com>
181+
Marius Schulz <marius.schulz@me.com>
182+
Mattias Buelens <mattias.buelens@gmail.com>
183+
Myles Megyesi <mylesmegyesi@users.noreply.github.com>
184+
Tim Lancina <tim@ionic.io>
185+
Aaron Holmes <aaron@aaronholmes.net> Aaron Holmes <aholmes@bltomato.com>
186+
Akshar Patel <akshar.patel.47@gmail.com>
187+
Ali Sabzevari <alisabzevari@gmail.com>
188+
Aliaksandr Radzivanovich <aradzivanovich@gmail.com>
189+
BuildTools <FranklinWhale@users.noreply.github.com> # Franklin Tse
190+
ChogyDan <danielhollocher@gmail.com> # Daniel Hollocher
191+
Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com> Daniel Rosenwasser <drosen@microsoft.com>
192+
David Kmenta <david.kmenta@lmc.eu>
193+
E020873 <nicolas.henry-partner@arcelormittal.com> # Nicolas Henry
194+
Elisée Maurer <elisee@sparklinlabs.com>
195+
Emilio García-Pumarino <emili.tfe@gmail.com> dashaus <emili.tfe@gmail.com>
196+
Guilherme Oenning <me@goenning.net>
197+
Herrington Darkholme <nonamesheep1@gmail.com>
198+
Ivo Gabe de Wolff <ivogabe@ivogabe.nl>
199+
Joey Wilson <joey.wilson.a@gmail.com>
200+
Jonathon Smith <failing@crashdive.co.uk>
201+
Juan Luis Boya García <ntrrgc@gmail.com>
202+
Kagami Sascha Rosylight <saschanaz@outlook.com>
203+
Lucien Greathouse <me@lpghatguy.com>
204+
Martin Vseticka <vseticka.martin@gmail.com>
205+
Mattias Buelens <mattias.buelens@opentelly.com>
206+
Michael Bromley <michael@michaelbromley.co.uk>
207+
Paul Jolly <paul@myitcv.org.uk>
208+
Perry Jiang <jiangperry@gmail.com>
209+
Peter Burns <rictic@google.com>
210+
Robert Coie <rac@intrigue.com>
211+
Thomas Loubiou <t.loubiou@systonic.fr>
212+
Tim Perry <tim.perry@softwire.com>
213+
Vidar Tonaas Fauske <vidartf@gmail.com>
214+
Viktor Zozulyak <zozulyakviktor@gmail.com>
215+
rix <rix@rixs-MacBook-Pro.local> # Richard Sentino
216+
rohitverma007 <rohitverma@live.ca> # Rohit Verma
Collapse file

‎.npmignore‎

Copy file name to clipboardExpand all lines: .npmignore
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
built
22
doc
3+
Gulpfile.ts
34
internal
45
issue_template.md
6+
jenkins.sh
57
lib/README.md
8+
netci.groovy
69
pull_request_template.md
710
scripts
811
src
Collapse file

‎.travis.yml‎

Copy file name to clipboardExpand all lines: .travis.yml
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ language: node_js
22

33
node_js:
44
- 'stable'
5+
- '6'
56
- '4'
67

78
sudo: false
@@ -15,7 +16,7 @@ matrix:
1516
branches:
1617
only:
1718
- master
18-
- release-2.0
19+
- release-2.1
1920

2021
install:
2122
- npm uninstall typescript

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.