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
Anthony Dresser
e0bdfc8b21
modify git edits to make webpack not be stupid ( #10442 )
2020-05-15 15:00:22 -07:00
ADS Merger
fa62ec1f34
Merge from vscode 7653d836944892f83ce9e1f95c1204bafa1aec31
2020-05-08 03:58:34 +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
Anthony Dresser
dd6b958898
Removing some unnecessary differences ( #9495 )
...
* work on removing some unncessary differences
* fix compile
* skip another test
2020-04-17 23:53:33 -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
ADS Merger
f5134198e2
Merge from vscode 93309f060778f6480a7d2a13913e6e7c624e9bc7
2020-03-26 07:08:23 +00:00
Anthony Dresser
89ef1b0c2e
Merge from vscode 073a24de05773f2261f89172987002dc0ae2f1cd ( #9711 )
2020-03-24 00:24:15 -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
Karl Burtram
70352f94ea
Fix ADS branding in Git viewlet ( #9332 )
2020-02-25 12:47:41 -08:00
Anthony Dresser
4a9c47d3d6
Merge from vscode 5e80bf449c995aa32a59254c0ff845d37da11b70 ( #9317 )
2020-02-24 21:15:52 -08:00
Anthony Dresser
0cec223301
Merge from vscode 777931080477e28b7c27e8f7d4b0d69897945946 ( #9220 )
2020-02-19 22:27:53 -08:00
ADS Merger
1e308639e5
Merge from vscode 9bc92b48d945144abb405b9e8df05e18accb9148
2020-02-19 03:11:35 +00:00
Anthony Dresser
873c6a39fe
Merge from vscode 1a81711a85e38ccf784110568ebf3784ab9094a5 ( #9161 )
...
* Merge from vscode 1a81711a85e38ccf784110568ebf3784ab9094a5
* small spacing fix
2020-02-15 00:43:09 -06: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
4ba6a979ba
Merge from vscode a4177f50c475fc0fa278a78235e3bee9ffdec781 ( #8649 )
...
* Merge from vscode a4177f50c475fc0fa278a78235e3bee9ffdec781
* distro
* fix tests
2019-12-11 22:42:23 -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
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
084524cd2d
Merge from vscode 313ede61cbad8f9dc748907b3384e059ddddb79a ( #7436 )
...
* Merge from vscode 313ede61cbad8f9dc748907b3384e059ddddb79a
* fix strict null checks
2019-09-30 23:35:45 -07:00
Anthony Dresser
07109617b5
Merge from vscode e0762af258c0b20320ed03f3871a41967acc4421 ( #7404 )
...
* Merge from vscode e0762af258c0b20320ed03f3871a41967acc4421
* readd svgs
2019-09-27 11:13:19 -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
6f297efb88
Merge from vscode 1ce89e2cb720d69c496c2815c4696ee4fd4429a6 ( #6779 )
...
* Merge from vscode 1ce89e2cb720d69c496c2815c4696ee4fd4429a6
* redisable accounts because of issues
2019-08-15 23:56:46 -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
Anthony Dresser
1d56a17f32
Merge from vscode 2cfc8172e533e50c90e6a3152f6bfb1f82f963f3 ( #6516 )
...
* Merge from vscode 2cfc8172e533e50c90e6a3152f6bfb1f82f963f3
* fix tests
2019-07-28 15:15:24 -07:00
Anthony Dresser
ee3663c1cd
Merge from vscode aba87f135229c17c4624341b7a2499dcedafcb87 ( #6430 )
...
* Merge from vscode aba87f135229c17c4624341b7a2499dcedafcb87
* fix compile errors
2019-07-18 18:32:57 -07:00
Anthony Dresser
bf4815d364
Remove some differences from us and vscode ( #6421 )
...
* remove some differences from us and vscode
* readd temp-write tpyings
2019-07-18 17:57:00 -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
df7645e4e5
Merge from vscode da3c97f3668393ebfcb9f8208d7616018d6d1859 ( #5360 )
2019-05-03 21:59:40 -07:00
Anthony Dresser
57242a2e13
Merge from vscode 3d67364fbfcf676d93be64f949e9b33e7f1b969e ( #5028 )
2019-04-14 22:29:14 -07:00
Karl Burtram
cb5bcf2248
Merge from vscode 2b0b9136329c181a9e381463a1f7dc3a2d105a34 ( #4880 )
2019-04-05 10:09:18 -07:00
Anthony Dresser
e6785ffe95
Merge from vscode de81ccf04849309f843db21130c806a5783678f7 ( #4738 )
2019-03-28 13:06:16 -07:00
Anthony Dresser
0d8ef9583b
Merge from vscode 966b87dd4013be1a9c06e2b8334522ec61905cc2 ( #4696 )
2019-03-26 11:43:38 -07:00
Anthony Dresser
b65ee5b42e
Merge from vscode fc10e26ea50f82cdd84e9141491357922e6f5fba ( #4639 )
2019-03-21 10:58:16 -07:00
Anthony Dresser
87765e8673
Vscode merge ( #4582 )
...
* Merge from vscode 37cb23d3dd4f9433d56d4ba5ea3203580719a0bd
* fix issues with merges
* bump node version in azpipe
* replace license headers
* remove duplicate launch task
* fix build errors
* fix build errors
* fix tslint issues
* working through package and linux build issues
* more work
* wip
* fix packaged builds
* working through linux build errors
* wip
* wip
* wip
* fix mac and linux file limits
* iterate linux pipeline
* disable editor typing
* revert series to parallel
* remove optimize vscode from linux
* fix linting issues
* revert testing change
* add work round for new node
* readd packaging for extensions
* fix issue with angular not resolving decorator dependencies
2019-03-19 17:44:35 -07:00
Matt Irvine
86bac90001
Merge VS Code 1.31.1 ( #4283 )
2019-03-15 13:09:45 -07:00