Commit Graph

65 Commits

Author SHA1 Message Date
ADS Merger
1388493cc1 Merge from vscode 2cd495805cf99b31b6926f08ff4348124b2cf73d 2020-06-30 11:31:11 -07:00
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
fa62ec1f34 Merge from vscode 7653d836944892f83ce9e1f95c1204bafa1aec31 2020-05-08 03:58:34 +00:00
ADS Merger
8420d9f04e Merge from vscode bd0efff9e3f36d6b3e1045cee9887003af8034d7 2020-05-06 02:35:49 +00:00
ADS Merger
93f35ca321 Merge from vscode 27ada910e121e23a6d95ecca9cae595fb98ab568 2020-04-30 00:53:43 +00:00
ADS Merger
7f1d8fc32f Merge from vscode 2e5312cd61ff99c570299ecc122c52584265eda2 2020-04-24 14:03:37 -07:00
ADS Merger
1868a7d370 Merge from vscode 10492ba146318412cbee8b76a8c630f226914734 2020-04-08 06:33:38 +00:00
ADS Merger
35f1a014d5 Merge from vscode 6fded8a497cd0142de3a1c607649a5423a091a25 2020-04-04 04:30:52 +00:00
Anthony Dresser
0bfbdc62ed Merge from vscode 2f984aad710215f4e4684a035bb02f55d1a9e2cc (#9819) 2020-04-01 00:44:39 -07:00
Anthony Dresser
dd8fb9433b Merge from vscode 5d18ad4c5902e3bddbc9f78da82dfc2ac349e908 (#9683) 2020-03-20 01:17:27 -07:00
Anthony Dresser
a53b78c0c8 Merge from vscode 099a7622e6e90dbcc226e428d4e35a72cb19ecbc (#9646)
* Merge from vscode 099a7622e6e90dbcc226e428d4e35a72cb19ecbc

* fix strict
2020-03-16 23:16:40 -07:00
ADS Merger
4c3e48773d Merge from vscode cfc1ab4c5f816765b91fb7ead3c3427a7c8581a3 2020-03-11 04:19:23 +00:00
Anthony Dresser
5d13ebf0d2 Merge from vscode e5834d3280fcd04898efeac32b9cf1b893f9b127 (#9385)
* Merge from vscode e5834d3280fcd04898efeac32b9cf1b893f9b127

* distro
2020-02-28 00:37:06 -08:00
Anthony Dresser
067fcc8dfb Merge from vscode dbe62be3266ffb6772a7f3db0bf61d63f4aa7f65 (#9337) 2020-02-26 00:23:48 -08:00
Anthony Dresser
1b78a9b1e0 Merge from vscode e6a45f4242ebddb7aa9a229f85555e8a3bd987e2 (#9253)
* Merge from vscode e6a45f4242ebddb7aa9a229f85555e8a3bd987e2

* skip failing tests

* remove github-authentication extensions

* ignore github compile steps

* ignore github compile steps

* check in compiled files
2020-02-21 12:11:51 -08:00
Anthony Dresser
0cec223301 Merge from vscode 777931080477e28b7c27e8f7d4b0d69897945946 (#9220) 2020-02-19 22:27:53 -08:00
ADS Merger
73ea8b79b2 Merge from vscode 1fbacccbc900bb59ba8a8f26a4128d48a1c97842 2020-02-13 02:56:02 +00:00
ADS Merger
085752f111 Merge from vscode 8a997f7321ae6612fc0e6eb3eac4f358a6233bfb 2020-02-11 07:08:19 +00:00
ADS Merger
2af13c18d2 Merge from vscode 718331d6f3ebd1b571530ab499edb266ddd493d5 2020-02-08 04:50:58 +00: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
bd7aac8ee0 Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2 (#8911)
* Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2

* update distro

* fix layering

* update distro

* fix tests
2020-01-22 13:42:37 -08:00
Anthony Dresser
30d9e9c141 Merge from vscode 4636be2b71c87bfb0bfe3c94278b447a5efcc1f1 (#8722)
* Merge from vscode 4636be2b71c87bfb0bfe3c94278b447a5efcc1f1

* remove tests that aren't working
2019-12-18 00:14:28 -08:00
Anthony Dresser
4ba6a979ba Merge from vscode a4177f50c475fc0fa278a78235e3bee9ffdec781 (#8649)
* Merge from vscode a4177f50c475fc0fa278a78235e3bee9ffdec781

* distro

* fix tests
2019-12-11 22:42:23 -08:00
Anthony Dresser
d614116b63 Merge from vscode a416c77e56ef0314ae00633faa04878151610de8 (#8600)
* Merge from vscode a416c77e56ef0314ae00633faa04878151610de8

* distro

* fix tests

* fix tests
2019-12-07 17:19:16 -08:00
Anthony Dresser
f5ce7fb2a5 Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c (#8525)
* Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c

* remove files we don't want

* fix hygiene

* update distro

* update distro

* fix hygiene

* fix strict nulls

* distro

* distro

* fix tests

* fix tests

* add another edit

* fix viewlet icon

* fix azure dialog

* fix some padding

* fix more padding issues
2019-12-04 19:28:22 -08:00
Anthony Dresser
a94cbb528e Merge from vscode f5d3ffa6a0d655c87e1eb0e1e90773df58f7ff25 (#7929)
* Merge from vscode f5d3ffa6a0d655c87e1eb0e1e90773df58f7ff25

* fix launch script

* add missing files
2019-10-22 21:49:55 -07:00
Anthony Dresser
1e22f47304 Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998 (#7880)
* Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998

* fix pipelines

* fix strict-null-checks

* add missing files
2019-10-21 22:12:22 -07:00
Anthony Dresser
6a6048d40f Merge from vscode 817eb6b0c720a4ecbc13c020afbbebfed667aa09 (#7356) 2019-09-24 21:36:17 -07:00
Anthony Dresser
db498db0a8 Merge from vscode 1eb87b0e9ce9886afeaecec22b31abd0d9b7939f (#7282)
* Merge from vscode 1eb87b0e9ce9886afeaecec22b31abd0d9b7939f

* fix various icon issues

* fix preview features
2019-09-19 21:50:52 -07:00
Anthony Dresser
ea0f9e6ce9 Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)
* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks
2019-09-15 22:38:26 -07:00
Anthony Dresser
658cf51887 Merge from vscode 0f73473c08055054f317c1c94502f7f39fdbb164 (#6892)
* Merge from vscode 0f73473c08055054f317c1c94502f7f39fdbb164

* fix tslinting
2019-08-22 22:07:01 -07:00
Anthony Dresser
ecb80f14f0 Merge from vscode 6e530127a1bb8ffbd1bfb77dc680c321dc0d71f5 (#6844) 2019-08-20 21:07:47 -07:00
Anthony Dresser
82c1c57c76 Merge from vscode ec07311dab2556c9d66a4cb3eecdc21c524202e1 (#6739) 2019-08-13 19:14:03 -07:00
Anthony Dresser
7eba8c4c03 Merge from vscode 52dcb723a39ae75bee1bd56b3312d7fcdc87aeed (#6719) 2019-08-12 21:31:51 -07:00
Chris LaFreniere
62d2fb534d Merge from vscode 709a07d51919d3266ca71699c6ddfb2d3547c0e1 (#6575) 2019-08-02 21:06:44 -07:00
Anthony Dresser
6db84eefa3 Merge from vscode 6268feb42ba4f2e2fa15484e88c9af60d254998c (#6530) 2019-07-29 21:03:02 -07:00
Anthony Dresser
15fc7a077a Merge from vscode e1d3dd53d17fb1529a002e4d6fb066db0a0bd385 (#6460)
* Merge from vscode e1d3dd53d17fb1529a002e4d6fb066db0a0bd385

* fix servers icon

* fix tests
2019-07-22 18:28:21 -07: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
5a7562a37b Revert "Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)" (#5983)
This reverts commit d15a3fcc98.
2019-06-11 12:35:58 -07:00
Chris LaFreniere
d15a3fcc98 Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)
* Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d

* Fix vs unit tests and hygiene issue

* Fix strict null check issue
2019-06-10 18:27:09 -07:00
Anthony Dresser
bcc449b524 Merge from vscode 5b9869eb02fa4c96205a74d05cad9164dfd06d60 (#5607) 2019-05-24 12:20:30 -07:00
Anthony Dresser
81ae86ff79 Revert "Revert "Merge from vscode ada4bddb8edc69eea6ebaaa0e88c5f903cbd43d8 (#5529)" (#5553)" (#5562)
This reverts commit c9a4f8f664.
2019-05-21 14:19:32 -07:00
Anthony Dresser
c9a4f8f664 Revert "Merge from vscode ada4bddb8edc69eea6ebaaa0e88c5f903cbd43d8 (#5529)" (#5553)
This reverts commit 5d44b6a6a7.
2019-05-20 17:07:32 -07:00
Anthony Dresser
5d44b6a6a7 Merge from vscode ada4bddb8edc69eea6ebaaa0e88c5f903cbd43d8 (#5529) 2019-05-19 18:52:19 -07:00
Anthony Dresser
43293b98c0 Merge from vscode fa77b52b5e2067798006aaff8e463a2b425509d5 (#5453) 2019-05-13 10:57:51 -07:00
Anthony Dresser
2b9a8b9136 Merge from vscode 8ef8aa6b3cb5b96870660fdd3bb8d0755e62fe51 (#5422) 2019-05-09 11:10:57 -07:00
Anthony Dresser
df7645e4e5 Merge from vscode da3c97f3668393ebfcb9f8208d7616018d6d1859 (#5360) 2019-05-03 21:59:40 -07:00
Anthony Dresser
2558a66a48 Merge from vscode 473af338e1bd9ad4d9853933da1cd9d5d9e07dc9 (#5286) 2019-04-30 21:53:52 -07:00
Anthony Dresser
a5bc65fbfb Merge from vscode 8b5ebbb1b8f6b2127bbbd551ac10cc080482d5b4 (#5041) 2019-04-15 20:37:22 -07:00