7 Commits

Author	SHA1	Message	Date
ADS Merger	5e7071e466	Merge from vscode 4d91d96e5e121b38d33508cdef17868bab255eae	2020-06-19 10:59:23 -07:00
ADS Merger	28be33cfea	Merge from vscode 79a1f5a5ca0c6c53db617aa1fa5a2396d2caebe2	2020-05-31 19:47:51 +00:00
ADS Merger	1868a7d370	Merge from vscode 10492ba146318412cbee8b76a8c630f226914734	2020-04-08 06:33:38 +00:00
Anthony Dresser	0bfbdc62ed	Merge from vscode 2f984aad710215f4e4684a035bb02f55d1a9e2cc (#9819)	2020-04-01 00:44:39 -07:00
Anthony Dresser	fefe1454de	Merge from vscode 3c6f6af7347d38e87bc6406024e8dcf9e9bce229 (#8962) ... * Merge from vscode 3c6f6af7347d38e87bc6406024e8dcf9e9bce229 * skip failing tests * update mac build image	2020-01-27 15:28:17 -08:00
Anthony Dresser	0b7e7ddbf9	Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381) ... * Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 * disable strict null check	2019-07-15 22:35:46 -07:00
Karl Burtram	dafb780987	Merge VS Code 1.21 source code (#1067) ... * Initial VS Code 1.21 file copy with patches * A few more merges * Post npm install * Fix batch of build breaks * Fix more build breaks * Fix more build errors * Fix more build breaks * Runtime fixes 1 * Get connection dialog working with some todos * Fix a few packaging issues * Copy several node_modules to package build to fix loader issues * Fix breaks from master * A few more fixes * Make tests pass * First pass of license header updates * Second pass of license header updates * Fix restore dialog issues * Remove add additional themes menu items * fix select box issues where the list doesn't show up * formatting * Fix editor dispose issue * Copy over node modules to correct location on all platforms	2018-04-04 15:27:51 -07:00