Commit Graph

7477 Commits

Author SHA1 Message Date
Alex Ross bdd162c53a Fix spaghetti in test file 2019-08-12 15:57:29 +02:00
Alex Ross 91da8dc700 Update C++ grammar for insiders to get hang fix
Fixes #78769
2019-08-12 15:01:26 +02:00
Joao Moreno 264d6ac829 💄 2019-08-12 14:06:53 +02:00
Joao Moreno 28bcf28232 Merge commit 'refs/pull/78562/head' of github.com:microsoft/vscode into pr/78562 2019-08-12 09:41:30 +02:00
Benjamin Pasero 5099e36e3d fix #77735 2019-08-12 08:13:10 +02:00
Daniel Imms d2ed5fb5e5 Make tslint.json jsonc language
Fixes #78821
2019-08-09 11:11:58 -07:00
Darrien Singleton 74a08650d6 Fixed incorrect git uri ref for untracked files 2019-08-09 08:08:42 -04:00
Daniel Imms ced08707d1 Fix terminal integration test 2019-08-08 09:34:34 -07:00
Joao Moreno 9f65705acf Merge commit 'refs/pull/75295/head' of github.com:microsoft/vscode into pr/75295 2019-08-08 16:56:51 +02:00
Joao Moreno 2c189f373f fix capture group 2019-08-08 16:38:39 +02:00
Joao Moreno daf581da39 fixes #71258 2019-08-08 16:30:47 +02:00
Joao Moreno 0bb4cc3daf remove misdirection 2019-08-08 12:43:01 +02:00
Dan McCarthy 72e3d3b45d Updated branch tooltip to display full branch name instead of "checkout..." (#72275)
Previously the tooltip displayed when hovering over a branch name in the git workflow simply said "Checkout...".

However, this could be better used by displaying the full branch name since long branch names are concatenated and not shown in full. Therefore it has been updated to do so.
2019-08-08 12:28:03 +02:00
Joao Moreno 5481dcca5e Merge commit 'refs/pull/71710/head' of github.com:microsoft/vscode into pr/71710 2019-08-08 12:17:46 +02:00
Joao Moreno 6af97c8756 💄 2019-08-08 12:02:55 +02:00
Joao Moreno 273cca4ac8 Merge commit 'refs/pull/70536/head' of github.com:microsoft/vscode into pr/70536 2019-08-08 11:57:25 +02:00
Joao Moreno 181759fe6a add git.smartCommitChanges 2019-08-08 11:55:13 +02:00
Joao Moreno 3dc34be7ae Merge commit 'refs/pull/70539/head' of github.com:microsoft/vscode into pr/70539 2019-08-08 11:34:18 +02:00
Joao Moreno fbf793cb4d Merge branch 'pr/67953' 2019-08-08 11:32:09 +02:00
Joao Moreno fa5c79386c git: promptToSaveFilesBeforeCommit should have more options
related to #66296
2019-08-08 11:30:25 +02:00
Joao Moreno f7fd6b34ba git: improve promptToSaveFilesBeforeCommit message 2019-08-08 11:22:52 +02:00
Joao Moreno d69616088c Merge commit 'refs/pull/67953/head' of github.com:microsoft/vscode into pr/67953 2019-08-08 11:22:28 +02:00
Alex Dima 3ffd892399 Fixes #59980 2019-08-08 11:06:50 +02:00
Joao Moreno bd30caa0d7 fix git count badge setting change update 2019-08-08 10:38:33 +02:00
Pine Wu bcc7f1219f Update services for #78285 2019-08-07 10:46:54 -07:00
Joao Moreno 59e3396c27 use add instead of stage 2019-08-07 17:37:44 +02:00
Joao Moreno 5a40f525bc Merge commit 'refs/pull/69506/head' of github.com:microsoft/vscode into pr/69506 2019-08-07 17:35:21 +02:00
João Moreno 555693ca34 Merge pull request #75213 from Olovan/master
Fix #72640
2019-08-07 17:30:15 +02:00
Daniel Imms 977a82fba3 Disable terminal tests that depend on terminal being hidden or shown in the past 2019-08-07 06:50:46 -07:00
Joao Moreno 8a2819be58 fixes #66620 2019-08-07 12:18:44 +02:00
João Moreno b8a8085ad1 Merge branch 'master' into rievans/gitpushbranchwithsymbolfail 2019-08-07 11:51:55 +02:00
Joao Moreno 3f4b96732c fixes #78541 2019-08-07 11:41:21 +02:00
Daniel Imms 81adc15a12 Merge remote-tracking branch 'origin/master' into tyriar/69865_remove_renderers 2019-08-06 10:02:39 -07:00
Daniel Imms dc6b475be7 Add global event window.onDidWriteTerminalData
Fixes #78502
2019-08-06 09:58:26 -07:00
Daniel Imms fcb78f5919 Merge branch 'master' into tyriar/69865_remove_renderers 2019-08-06 09:33:05 -07:00
Joao Moreno 21a4e91688 cleanup 2019-08-06 18:28:33 +02:00
Joao Moreno a6177d979a cleanup for pr #66095 2019-08-06 17:49:42 +02:00
Joao Moreno c769d8a08a Merge commit 'refs/pull/66095/head' of github.com:microsoft/vscode into pr/66095 2019-08-06 16:57:22 +02:00
Joao Moreno 797bd786ac Merge commit 'refs/pull/65906/head' of github.com:microsoft/vscode into pr/65906 2019-08-06 16:44:25 +02:00
Joao Moreno 7f30cbc3a2 Merge remote-tracking branch 'origin/master' 2019-08-06 16:42:16 +02:00
Joao Moreno a39b7f23aa Merge commit 'refs/pull/65247/head' of github.com:microsoft/vscode into pr/65247 2019-08-06 16:41:02 +02:00
Alex Ross 742a6d7240 Fix powershell color test 2019-08-06 16:39:10 +02:00
Alex Ross a648e3063e Add powershell members to default themes (#78270)
Fixes #78212
2019-08-06 15:55:49 +02:00
Daniel Imms 42b36208eb Merge remote-tracking branch 'origin/master' into tyriar/69865_remove_renderers 2019-08-06 06:41:51 -07:00
Darrien Singleton b93c4fa3b5 new branch 2019-08-06 09:22:17 -04:00
Joao Moreno 54c6639bf8 add git.supportCancellation setting 2019-08-06 14:15:47 +02:00
Joao Moreno 1c781cb1d2 Merge branch 'pr/78504' 2019-08-06 13:53:54 +02:00
Joao Moreno 3bbbad38c1 💄 2019-08-06 13:53:34 +02:00
Joao Moreno c30ae90a9c Merge commit 'refs/pull/78504/head' of github.com:microsoft/vscode into pr/78504 2019-08-06 13:52:15 +02:00
Alex Ross 2bf257c0c5 Implement resolveTask for typescript tasks
Fixes #76521
2019-08-06 09:59:09 +02:00