Anthony Dresser
323e62c967
Utilize test skipping to reduce merge conflicts ( #6937 )
...
* utilize test skipping to reduce merge conflicts
* fix compile error
2019-08-26 13:05:19 -07:00
Anthony Dresser
92a3acbfe8
Merge from vscode e3b9b8eefc062d68ba8a4b6a817162d132f3b533 ( #6932 )
...
* Merge from vscode e3b9b8eefc062d68ba8a4b6a817162d132f3b533
* skip failing test
* add comment
2019-08-24 00:19:48 -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
985bfae8a0
Merge from vscode e558dc6ea73a75bd69d7a0b485f0e7e4194c66bf ( #6864 )
2019-08-21 20:44:59 -07:00
Charles Gagnon
3fde278ed2
Update events for insiders ( #6807 )
...
* Update events for insiders
* Add back in isBuilt check
2019-08-21 07:41:31 -07:00
Anthony Dresser
ecb80f14f0
Merge from vscode 6e530127a1bb8ffbd1bfb77dc680c321dc0d71f5 ( #6844 )
2019-08-20 21:07:47 -07:00
Anthony Dresser
41d8663b09
Merge from vscode 70dc55955d586ebd427658b43cdb344f2047f9c2 ( #6789 )
2019-08-16 21:47:46 -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
58bfba4b47
Merge from vscode b12f623603e2fc1c5b3037115fa37c1a6acc4165 ( #6760 )
2019-08-15 02:19:31 -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
Charles Gagnon
c7f2967e5d
Revert "Use VS Code iKey and modify event prefix ( #6656 )" ( #6677 )
...
This reverts commit 7adb8dd74b .
2019-08-09 14:14:30 -07:00
Charles Gagnon
7adb8dd74b
Use VS Code iKey and modify event prefix ( #6656 )
...
* Use VS Code iKey and modify event prefix
* Move carbon edit lines to same line
2019-08-08 15:55:43 -07:00
Chris LaFreniere
62d2fb534d
Merge from vscode 709a07d51919d3266ca71699c6ddfb2d3547c0e1 ( #6575 )
2019-08-02 21:06:44 -07:00
Anthony Dresser
7f5a72cdab
Integrate into asar ( #6563 )
...
* integrate into asar
* add sql carbon tag
* remove unnecessary edit
* add more ignores
2019-08-02 13:17:06 -07:00
Anthony Dresser
6db84eefa3
Merge from vscode 6268feb42ba4f2e2fa15484e88c9af60d254998c ( #6530 )
2019-07-29 21:03:02 -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
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
ee3663c1cd
Merge from vscode aba87f135229c17c4624341b7a2499dcedafcb87 ( #6430 )
...
* Merge from vscode aba87f135229c17c4624341b7a2499dcedafcb87
* fix compile errors
2019-07-18 18:32:57 -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
Charles Gagnon
3bc82c10b1
Change some of the env vars to be ADS-specific ( #5636 )
...
* Change some of the env vars to be ADS-specific
* Undo changes to ext host IPC hook
* Keep VSCODE_LOGS vars too
2019-05-24 17:17:02 -07:00
Anthony Dresser
bcc449b524
Merge from vscode 5b9869eb02fa4c96205a74d05cad9164dfd06d60 ( #5607 )
2019-05-24 12:20:30 -07:00
Anthony Dresser
5e8a52bcc0
Query Editor Refactor ( #5528 )
...
* query editor changes
* query editor changes
* finish converting query editor
* fix merge issue
* remove unused code
* fix tests
* fix tests
* remove editor context key class
* edit tests to test input state
2019-05-23 11:43:59 -07:00
Anthony Dresser
cf8f8907ee
Merge from vscode 8aa90d444f5d051984e8055f547c4252d53479b3 ( #5587 )
...
* Merge from vscode 8aa90d444f5d051984e8055f547c4252d53479b3
* pipeline errors
* fix build
2019-05-23 11:16:03 -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
34457880c7
Merge from vscode 0fde6619172c9f04c41f2e816479e432cc974b8b ( #5199 )
2019-04-24 22:26:02 -07:00
Anthony Dresser
9c0e56d640
Layering of everything else but query ( #5085 )
...
* layer profiler and edit data
* relayering everything but query
* fix css import
* readd qp
* fix script src
* fix hygiene
2019-04-18 01:28:43 -07:00
Anthony Dresser
ddd89fc52a
Renable Strict TSLint ( #5018 )
...
* removes more builder references
* remove builder from profiler
* formatting
* fix profiler dailog
* remove builder from oatuhdialog
* remove the rest of builder references
* formatting
* add more strict null checks to base
* enable strict tslint rules
* fix formatting
* fix compile error
* fix the rest of the hygeny issues and add pipeline step
* fix pipeline files
2019-04-18 00:34:53 -07:00
Alan Ren
b852f032d3
Merge from vscode 3a6dcb42008d509900b3a3b2d695564eeb4dbdac ( #5098 )
2019-04-17 23:38:44 -07:00
Anthony Dresser
8956b591f7
Merge from vscode 05fc61ffb1aee9fd19173c32113daed079f9b7bd ( #5074 )
...
* Merge from vscode 05fc61ffb1aee9fd19173c32113daed079f9b7bd
* fix tests
2019-04-16 22:11:30 -07:00
Anthony Dresser
5c10127758
Layer grid code ( #5029 )
...
* layer grid
* errors; edit data still not showing up
* fix edit data
* fix tab spaces
2019-04-16 13:30:15 -07:00
Anthony Dresser
a5bc65fbfb
Merge from vscode 8b5ebbb1b8f6b2127bbbd551ac10cc080482d5b4 ( #5041 )
2019-04-15 20:37:22 -07:00
Anthony Dresser
57242a2e13
Merge from vscode 3d67364fbfcf676d93be64f949e9b33e7f1b969e ( #5028 )
2019-04-14 22:29:14 -07:00
Anthony Dresser
8315dacda4
Merge from vscode 31e03b8ffbb218a87e3941f2b63a249f061fe0e4 ( #4986 )
2019-04-10 16:29:23 -07:00
Karl Burtram
02cf91c158
Remove broken VS Code test from merge ( #4887 )
2019-04-05 15:06:11 -07:00
Karl Burtram
0532346f4f
Merge from vscode 591842cc4b71958c81947b254924a215fe3edcbd ( #4886 )
2019-04-05 14:14:26 -07:00
Karl Burtram
cb5bcf2248
Merge from vscode 2b0b9136329c181a9e381463a1f7dc3a2d105a34 ( #4880 )
2019-04-05 10:09:18 -07:00
Anthony Dresser
0d8ef9583b
Merge from vscode 966b87dd4013be1a9c06e2b8334522ec61905cc2 ( #4696 )
2019-03-26 11:43:38 -07:00
Anthony Dresser
4a87a24235
Merge from vscode 011858832762aaff245b2336fb1c38166e7a10fb ( #4663 )
2019-03-22 13:07:54 -07:00
Matt Irvine
0b44b7d384
Fix issue reporter 'Visual Studio Code' text ( #4658 )
2019-03-21 15:38:25 -07:00
Anthony Dresser
b65ee5b42e
Merge from vscode fc10e26ea50f82cdd84e9141491357922e6f5fba ( #4639 )
2019-03-21 10:58:16 -07:00
Anthony Dresser
c814b92557
VSCode merge ( #4610 )
...
* Merge from vscode e388c734f30757875976c7e326d6cfeee77710de
* fix yarn lcoks
* remove small issue
2019-03-20 10:39:09 -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
Raj Musuku
666ae11639
Merge from master
2019-02-21 17:56:04 -08:00
David Shiflet
87bbb41fb6
window reuse for connections ( #4049 )
...
* window reuse for connections
* space after colon
* use undefined instead of null
2019-02-15 09:44:06 -05:00