development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-13 14:57:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
71694 commits 1119 branches 299 tags 1.2 GiB
Commit graph

432 commits

Author SHA1 Message Date
tomerstav 7b936983f6 Renamed rebaseOnto to rebase 2020-10-23 03:35:27 +00:00
tomerstav 741925db11 Implemented rebase onto 2020-10-19 04:13:52 +00:00
João Moreno b9115b8b9c
fixes #108714 2020-10-16 16:58:25 +02:00
Eric Amodio 0ac9d25b81 Closes #91695 - adds emoji support 2020-10-12 14:38:07 -04:00
Eric Amodio 9910c38005 Fixes #108530 2020-10-12 11:08:13 -04:00
Eric Amodio d8b1776ccb Closes #97407, #93405 2020-10-09 02:31:48 -04:00
Martin Aeschlimann 2ef6c258b0
Merge pull request #107215 from microsoft/aeschli/welcomeViewGroups 
groups for viewsWelcome
 2020-09-28 14:10:06 -07:00
João Moreno 5a18ae699c
💄 2020-09-28 16:33:29 +02:00
michaelwood@onetrail.com 536652aab5 added additional colour options for differing git staging statuses 2020-09-23 20:31:30 +02:00
Martin Aeschlimann 99c8d615c1 groups for viewsWelcome 2020-09-22 12:04:53 +02:00
WhizSid c334da1952
Multi git executable paths (#85954) 
* Multi git executable path

* update `git.path` setting description

* 💄

Co-authored-by: João Moreno <joao.moreno@microsoft.com>
 2020-09-10 15:02:37 +02:00
Vyacheslav Pukhanov 663810e275
Adds commands for --no-verify commit variants (#106335) 
* add `{allow,confirm}NoVerifyCommit`  options

* adds commit comands with no verify

* handles no verify command variants

* handle no verify commit option

* only display no verify variants when option is set
 2020-09-10 11:14:28 +02:00
João Moreno 6aafc4b7aa
fixes #104762 2020-08-31 15:21:15 +02:00
Benjamin Pasero 1689304b52 Allow to configure workbench.editor.restoreViewState per language (fix #101110) 2020-08-24 07:58:05 +02:00
João Moreno 2f2ba0d764
fixes #102455 2020-08-05 12:09:17 +02:00
João Moreno 532c7b1c78 cleaner git submenus 2020-08-03 14:11:14 +02:00
João Moreno 22ff86bac3 fixes #102109 2020-07-31 15:38:16 +02:00
NotWearingPants 399d695f5f
Treat all files with a gitignore extension as ignore files 2020-07-22 00:18:54 +03:00
Martin Aeschlimann 4c99db1a05 file extensins: put primary first. For #102100 2020-07-11 17:36:19 +02:00
Benjamin Pasero 0e96426609 🆙 iconv-lite-umd@0.6.8 (fix #101905) 2020-07-08 17:29:59 +02:00
Benjamin Pasero d95b65443d Encoding euckr does not exist anymore (fix #101847) 2020-07-07 14:03:23 +02:00
Benjamin Pasero 1fb0d4424d
🆙 jschardet@2.2.1 (#33720) (#101489) 2020-07-03 15:53:02 +02:00
Fedor Nezhivoi 574779eb61
update iconv-lite-umd to 0.6.5 for #79275 (#101262) 2020-06-29 08:12:42 +02:00
Fedor Nezhivoi b03f792383
update iconv-lite-umd to 0.6.4 for #79275 (#101213) 2020-06-28 10:05:39 +02:00
isidor 4e6150b4e0 change unstage selected ranges to cmd+k cmd+n 
fixes #99011
 2020-06-25 09:19:18 +02:00
Fedor Nezhivoi 24e0a82229
Move encoding to common for #79275 (#100539) 
* move encoding.ts to common for #79275

* load iconv-lite-umd and jschardet in web version for #79275

* move EncodingOracle to the AbstractTextFileService for #79275

* review

* update to new iconv-lite-umd

* add workaround for jschardet types

* fix indentation

* add iconv-lite-umd and jschardet to workbench.html

* fix paths for modules

Co-authored-by: Benjamin Pasero <benjpas@microsoft.com>
 2020-06-20 10:47:29 +02:00
Fedor Nezhivoi 314b58c8e1
switch to use iconv-lite-umd for #79275 (#100472) 
Co-authored-by: Benjamin Pasero <benjpas@microsoft.com>
 2020-06-18 16:08:17 +02:00
Benjamin Pasero 3675f28129 Revert "Revert "decouple vs/base/node/encoding.ts from node streams for #79275 (#99413)"" 
This reverts commit 495112ded5.
 2020-06-17 10:45:58 +02:00
João Moreno 208d556b1d
fixes #100015 2020-06-17 09:41:55 +02:00
Benjamin Pasero 495112ded5 Revert "decouple vs/base/node/encoding.ts from node streams for #79275 (#99413)" 
This reverts commit 1dbfecd37f.
 2020-06-17 09:09:59 +02:00
Fedor Nezhivoi 1dbfecd37f
decouple vs/base/node/encoding.ts from node streams for #79275 (#99413) 2020-06-17 09:09:12 +02:00
João Moreno 24f1b69a90
git file system should wait for model to be initialized 2020-06-10 15:44:53 +02:00
João Moreno e0046cbd1d
💄 2020-05-27 15:35:08 +02:00
Pascal Fong Kye d2b5d323d0 feat:new command stage all merge 2020-05-24 21:58:24 +02:00
João Moreno a85a2e6044 move credential provider to github 2020-05-18 21:04:29 +02:00
João Moreno ea89f2d8b9 related to microsoft/vscode-pull-request-github#1759 2020-05-13 11:24:51 +02:00
Ladislau Szomoru ee8a6bc4f8
Git: Add "git rebase --abort" command (#97071) 
Add "git rebase --abort" command
 2020-05-07 14:26:55 +02:00
João Moreno 75877c8185
Merge pull request #96080 from johnbillion/fix/gitignore_global 
Treat `.gitignore_global` as an Ignore file by default.
 2020-04-27 15:58:23 +02:00
João Moreno 8ff93b98c5 git: config.githubAuthentication 2020-04-27 14:57:47 +02:00
João Moreno 54d8261f93 git: config.terminalAuthentication 2020-04-27 14:57:47 +02:00
John Blackbourn 4281e933d3 Treat .gitignore_global as an Ignore file by default. Fixes #96079. 2020-04-24 18:44:18 +01:00
Jonathan Fleckenstein f12f21d320
remove duplicate git.pullFrom command 2020-04-21 10:44:38 -04:00
João Moreno 968de61532 Merge commit 'refs/pull/81982/head' of github.com:microsoft/vscode into pr/81982 2020-04-20 14:25:59 +02:00
Isidor Nikolic 71913027c3
Merge pull request #93706 from ChrisPapp/git_keybindings 
Add default keybindings for stage/revert/unstage selected ranges
 2020-04-09 17:13:27 +02:00
João Moreno 6e89889166
Merge pull request #91872 from jeanp413/fix-91871 
Fixes missing git folder actions under Untracked Changes group in scm viewlet
 2020-04-07 17:27:01 +02:00
Eric Amodio 4f179b7241 Adds better menu grouping 2020-04-06 23:21:40 -04:00
Jean Pierre e0850567f5
Merge branch 'master' into fix-91871 2020-04-05 20:26:43 -05:00
Eric Amodio 2c684a77a6 Fixes #94107 remove open changes action 2020-04-03 17:28:09 -04:00
Christos Pappas 482acb89e9 Add mac specific keys 
Use command key instead of ctrl on Mac
 2020-04-01 20:16:21 +03:00
’Christos 602f3f9b46 Add default keybindings for stage/revert/unstage selected ranges 
git.stageSelectedRanges   -> ctrl + k, ctrl + alt + s
git.unstageSelectedRanges -> ctrl + k, ctrl + u
git.revertSelectedRanges  -> ctrl + k, ctrl + r

Closes #93564
 2020-03-30 02:49:03 +03:00