Skip to content

Commit c8f368b

Browse files
cleidighcleidigh
committed
Merge branch 'upstream/master' into selectbox-decorator/add
2 parents d724360 + aec79b9 commit c8f368b

514 files changed

Lines changed: 10522 additions & 7416 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/calendar.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,7 @@
3131
'2018-09-24 18:00, US/Pacific': 'endgame',
3232
'2018-10-08 09:00, US/Pacific': 'development', # 1.28.0 released
3333
'2018-10-29 18:00, US/Pacific': 'endgame',
34-
# '2018-11-07 09:00, US/Pacific': 'development', # 1.29.0 released
34+
'2018-11-12 11:00, US/Pacific': 'development', # 1.29.0 released
35+
'2018-12-03 18:00, US/Pacific': 'endgame',
36+
# '2018-12-12 11:00, US/Pacific': 'development', # 1.30.0 released
3537
}

‎.github/classifier.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
css-less-scss: [ aeschli ],
1616
debug-console: [],
1717
debug: {
18-
assignees: [ weinand ],
18+
assignees: [ isidorn ],
1919
assignLabel: false
2020
},
2121
diff-editor: [],
@@ -131,7 +131,7 @@
131131
assignLabel: false
132132
},
133133
suggest: [],
134-
tasks: [ dbaeumer ],
134+
tasks: [ alexr00 ],
135135
telemetry: [],
136136
themes: [],
137137
tokenization: [],

‎.github/commands.yml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,16 @@
6262
name: 'confirm',
6363
allowUsers: ['cleidigh', 'usernamehw'],
6464
action: 'updateLabels',
65-
addLabel: 'confirmed'
65+
addLabel: 'confirmed',
66+
removeLabel: 'confirmation-pending'
67+
},
68+
{
69+
type: 'comment',
70+
name: 'confirmationPending',
71+
allowUsers: ['cleidigh', 'usernamehw'],
72+
action: 'updateLabels',
73+
addLabel: 'confirmation-pending',
74+
removeLabel: 'confirmed'
6675
},
6776
{
6877
type: 'comment',

‎.yarnrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
disturl "https://atom.io/download/electron"
2-
target "2.0.12"
2+
target "3.0.10"
33
runtime "electron"

‎ThirdPartyNotices.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ This project incorporates components from the projects listed below. The origina
2020
13. davidrios/pug-tmbundle (https://github.com/davidrios/pug-tmbundle)
2121
14. definitelytyped (https://github.com/DefinitelyTyped/DefinitelyTyped)
2222
15. demyte/language-cshtml (https://github.com/demyte/language-cshtml)
23-
16. Document Object Model (https://www.w3.org/DOM/)
23+
16. Document Object Model version 4.0.0 (https://www.w3.org/DOM/)
2424
17. dotnet/csharp-tmLanguage version 0.1.0 (https://github.com/dotnet/csharp-tmLanguage)
2525
18. expand-abbreviation version 0.5.8 (https://github.com/emmetio/expand-abbreviation)
2626
19. fadeevab/make.tmbundle (https://github.com/fadeevab/make.tmbundle)
@@ -62,7 +62,7 @@ This project incorporates components from the projects listed below. The origina
6262
55. textmate/ruby.tmbundle (https://github.com/textmate/ruby.tmbundle)
6363
56. textmate/yaml.tmbundle (https://github.com/textmate/yaml.tmbundle)
6464
57. TypeScript-TmLanguage version 0.1.8 (https://github.com/Microsoft/TypeScript-TmLanguage)
65-
58. Unicode (http://www.unicode.org/)
65+
58. Unicode version 12.0.0 (http://www.unicode.org/)
6666
59. vscode-logfile-highlighter version 1.2.0 (https://github.com/emilast/vscode-logfile-highlighter)
6767
60. vscode-swift version 0.0.1 (https://github.com/owensd/vscode-swift)
6868
61. Web Background Synchronization (https://github.com/WICG/BackgroundSync)

‎build/builtInExtensions.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"name": "ms-vscode.node-debug",
4-
"version": "1.30.3",
4+
"version": "1.30.4",
55
"repo": "https://github.com/Microsoft/vscode-node-debug",
66
"metadata": {
77
"id": "b6ded8fb-a0a0-4c1c-acbd-ab2a3bc995a6",
@@ -16,7 +16,7 @@
1616
},
1717
{
1818
"name": "ms-vscode.node-debug2",
19-
"version": "1.30.2",
19+
"version": "1.30.3",
2020
"repo": "https://github.com/Microsoft/vscode-node-debug2",
2121
"metadata": {
2222
"id": "36d19e17-7569-4841-a001-947eb18602b2",
@@ -31,7 +31,7 @@
3131
},
3232
{
3333
"name": "ms-vscode.references-view",
34-
"version": "0.0.15",
34+
"version": "0.0.19",
3535
"repo": "https://github.com/Microsoft/vscode-reference-view",
3636
"metadata": {
3737
"id": "dc489f46-520d-4556-ae85-1f9eab3c412d",

‎build/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"minimist": "^1.2.0",
3939
"request": "^2.85.0",
4040
"tslint": "^5.9.1",
41-
"typescript": "3.1.4",
41+
"typescript": "3.2.2",
4242
"vsce": "1.48.0",
4343
"xml2js": "^0.4.17"
4444
},

‎build/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1894,10 +1894,10 @@ typed-rest-client@^0.9.0:
18941894
tunnel "0.0.4"
18951895
underscore "1.8.3"
18961896

1897-
typescript@3.1.4:
1898-
version "3.1.4"
1899-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.4.tgz#c74ef7b3c2da65beff548b903022cb8c3cd997ed"
1900-
integrity sha512-JZHJtA6ZL15+Q3Dqkbh8iCUmvxD3iJ7ujXS+fVkKnwIVAdHc5BJTDNM0aTrnr2luKulFjU7W+SRhDZvi66Ru7Q==
1897+
typescript@3.2.2:
1898+
version "3.2.2"
1899+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.2.tgz#fe8101c46aa123f8353523ebdcf5730c2ae493e5"
1900+
integrity sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==
19011901

19021902
uc.micro@^1.0.1, uc.micro@^1.0.5:
19031903
version "1.0.5"

‎cgmanifest.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "chromium",
88
"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
9-
"commitHash": "7accc8730b0f99b5e7c0702ea89d1fa7c17bfe33"
9+
"commitHash": "164c37e3f235134c88e80fac2a182cfba3f07f00"
1010
}
1111
},
1212
"licenseDetail": [
@@ -40,45 +40,45 @@
4040
"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
4141
],
4242
"isOnlyProductionDependency": true,
43-
"version": "61.0.3163.100"
43+
"version": "66.0.3359.181"
4444
},
4545
{
4646
"component": {
4747
"type": "git",
4848
"git": {
4949
"name": "libchromiumcontent",
5050
"repositoryUrl": "https://github.com/electron/libchromiumcontent",
51-
"commitHash": "ccdb085454b0a387ee96e0f81a7ca9a8ce07a710"
51+
"commitHash": "d9e39391cfae447a84e276a402342cf8b4b5bcba"
5252
}
5353
},
5454
"isOnlyProductionDependency": true,
5555
"license": "MIT",
56-
"version": "61.0.3163.100"
56+
"version": "66.0.3359.181"
5757
},
5858
{
5959
"component": {
6060
"type": "git",
6161
"git": {
6262
"name": "nodejs",
6363
"repositoryUrl": "https://github.com/nodejs/node",
64-
"commitHash": "8a44289089a08b7b19fa3c4651b5f1f5d1edd71b"
64+
"commitHash": "5cbb905c1af7cea2d709932d59827d7c6d03ef4a"
6565
}
6666
},
6767
"isOnlyProductionDependency": true,
68-
"version": "8.9.3"
68+
"version": "10.2.0"
6969
},
7070
{
7171
"component": {
7272
"type": "git",
7373
"git": {
7474
"name": "electron",
7575
"repositoryUrl": "https://github.com/electron/electron",
76-
"commitHash": "d281859cf59f12c7107a540a9f4cba0ecf5eff41"
76+
"commitHash": "4305657858592be2b44c95ae7af53c627dcdc5e7"
7777
}
7878
},
7979
"isOnlyProductionDependency": true,
8080
"license": "MIT",
81-
"version": "2.0.12"
81+
"version": "3.0.10"
8282
},
8383
{
8484
"component": {

‎extensions/csharp/cgmanifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "dotnet/csharp-tmLanguage",
88
"repositoryUrl": "https://github.com/dotnet/csharp-tmLanguage",
9-
"commitHash": "b95e4044ff1ac52e03f622de76f459dc5388954c"
9+
"commitHash": "ad7514e8d78542a6ee37f6187091cd4102eb3797"
1010
}
1111
},
1212
"license": "MIT",

0 commit comments

Comments
 (0)