Commit graph

267 commits

Author SHA1 Message Date
Joao Moreno 3a54676f50 move successful push notification into repository 2018-07-06 14:53:13 +02:00
Joao Moreno ead170df00 Merge commit 'refs/pull/47790/head' of github.com:Microsoft/vscode into pr/47790 2018-07-06 14:48:10 +02:00
Dirk Baeumer 21991b4912 Move to latest vscode-nls for corrupted cache support 2018-07-03 16:12:52 +02:00
wistcc 5c02579269 Adding the git.syncRebase setting 2018-06-20 21:11:36 -04:00
João Moreno 4e26c330a8
Merge pull request #46066 from ddruker/ddruker/differentiate-foreground-color-git
[GIT EXTENSION] Add Custom Foreground Color for Files Added to Index
2018-06-04 17:21:14 +02:00
Jan Pilzer f3874f1bae
Add gitignore language 2018-06-02 19:28:58 -07:00
Morten Henriksen 83da71325c Add branch name validation and whitespace config
* Adds `git.createBranchNameConvention.regexp`
* Adds `git.createBranchWhitespaceChar`

Fixes #50241
2018-05-29 19:55:41 +02:00
Ramya Achutha Rao 1139de12c0 Create appInsights client only if user has opt-in to telemetry 2018-04-25 15:21:15 -07:00
Peng Lyu c69deaccd0 activate git by * 2018-04-23 17:58:54 -07:00
Joao Moreno 56ad4b3953 clone repo by url 2018-04-23 16:20:08 +02:00
Ramya Achutha Rao 953cdf7f3d Update vscode-extension-telemetry version 2018-04-20 10:30:05 -07:00
wbarajas@umich.edu 6c9265e2fd Merge branch 'master' of https://github.com/wmb0117/vscode 2018-04-16 22:36:36 -04:00
wbarajas@umich.edu 2c2122ee5d feature: add support to manually add repositories 2018-04-16 22:35:18 -04:00
Sandeep Somavarapu e592885b49 Fix #46750 2018-04-16 17:10:46 +02:00
Adit Bhatt 59c06466c2 feat: add support for ignored repositories list 2018-04-14 22:55:23 -04:00
Pradeep Murugesan f1a362b250 Commit always using sign off flag setting 47395 2018-04-13 11:28:35 +02:00
Ivor Huang ee748ab5c8 implement push success notification for issue #39039 2018-04-12 20:48:31 -04:00
Joao Moreno ab149aba6e fixes #21146 2018-03-27 14:50:53 +02:00
David 9c848a3b8b
Merge branch 'master' into ddruker/differentiate-foreground-color-git 2018-03-19 10:16:42 -04:00
Joao Moreno 1d0271f486 Merge branch 'submodule-limit-workspace-setting' of https://github.com/shobhitchittora/vscode into shobhitchittora-submodule-limit-workspace-setting 2018-03-19 14:28:29 +01:00
Joao Moreno 0c01c63d92 show actions in the right editor only 2018-03-19 14:26:37 +01:00
Joao Moreno f929d1cd05 Merge branch 'git_actions_context_menu' of https://github.com/nikonso/vscode into nikonso-git_actions_context_menu 2018-03-19 14:09:47 +01:00
DAVID DRUKER ab19d7b43d add custom color for files added to index 2018-03-18 14:06:12 -07:00
Shobhit Chittora 1c6aa0e93d Adds workspace config for submodules detection limit
Closes #45266
2018-03-14 10:09:04 +05:30
Ramya Achutha Rao 251101e6ea Use latest AI to avoid monkey patching of modules Fixes Microsoft/vscode-extension-telemetry#12 2018-02-27 13:42:26 -08:00
Joao Moreno d7df300c7a bump git version 2018-02-27 13:03:00 +01:00
Ramya Achutha Rao c1ee104fd4 Use latest version of telemetry module 2018-02-23 14:57:27 -08:00
Joao Moreno 8e746bbd4c show show git output command 2018-02-23 09:04:57 +01:00
Joao Moreno efa33330fb use png icon for git 2018-02-21 10:04:06 +01:00
Joao Moreno 86e3c7ea16 git extension icon
related to #43978
2018-02-20 16:47:02 +01:00
Joao Moreno a563e2cb38 consolidate git extensions
related to #43978
2018-02-20 16:47:01 +01:00
Bruno Ribeito 044bd99285 Fix #25541 2018-02-18 17:41:25 +00:00
Ramya Achutha Rao ad06c9c609 Update telemetry module 2018-02-17 17:27:09 -08:00
Ramya Achutha Rao 994bfe6903 Update telemetry module to fix issue of missing version in events 2018-02-13 17:07:30 -08:00
Joao Moreno e2aac2a65d related to #42532 2018-02-08 17:23:43 +01:00
Joao Moreno b34b376061 fixes #42532 2018-02-08 16:32:40 +01:00
Joao Moreno f41136f5c0 fixes #43066 2018-02-08 11:38:37 +01:00
Joao Moreno 611f54ad40 fixes #40421 2018-02-01 10:00:56 +01:00
Joao Moreno 2d4b6e9124 fixes #40947 2018-02-01 09:40:22 +01:00
Joao Moreno b543a60cff Merge branch 'scm-input-validation-provider' 2018-01-30 19:37:49 +01:00
Joao Moreno 985962d2a2 Revert "provide original english translations for git"
This reverts commit b0e3568730.
2018-01-30 09:41:14 +01:00
Dirk Baeumer e91b851ca8 Upgrade to latest language pack format 2018-01-30 00:11:57 +01:00
Ramya Achutha Rao 71c3b15465 Update the telemetry module used by extensions 2018-01-29 14:53:24 -08:00
Joao Moreno b0e3568730 provide original english translations for git
related to #39778
2018-01-29 18:37:35 +01:00
Joao Moreno 888f74495d lineWarningLength -> validationProvider 2018-01-26 16:43:53 +01:00
Joao Moreno 786ea020f7 optionally show Open File action
fixes #41137
2018-01-26 15:29:21 +01:00
Joao Moreno 41886d2793 fix smoketests 2018-01-26 11:36:40 +01:00
Dirk Baeumer 04594c864b Add support for Language Packs 2018-01-25 21:14:34 +01:00
Joao Moreno 590d36f948 fixes #40439 2017-12-18 16:04:24 +01:00
Joao Moreno f6ee190cf7 fixes #36885 2017-12-15 15:39:01 +01:00
Joao Moreno 9622ada626 find git in LocalAppData and PATH, win32
fixes #40229
2017-12-15 10:38:02 +01:00
Joao Moreno 3017bc0f9c git submodule decorations 2017-12-14 12:03:54 +01:00
Joao Moreno 7ae85acb65 Merge branch 'newAutoRepositoryDetection' of https://github.com/BattleBas/vscode into BattleBas-newAutoRepositoryDetection 2017-12-11 17:42:25 +01:00
Joao Moreno 6e5e8abb16 fixes #35031 2017-12-04 15:16:07 +01:00
Joao Moreno 9544e5faa0 git.enabled as a resource setting
fixes #37492
2017-11-27 16:08:15 +01:00
Joao Moreno e69ca9ff85 cleanup git commands enablement 2017-11-27 16:08:15 +01:00
Joao Moreno 629ad31204 fix git commands 2017-11-27 16:08:15 +01:00
Joao Moreno 548bfe91af disable auto fetch
fixes #34684
2017-11-24 11:12:45 +01:00
Joao Moreno 000325a03b alert when git is missing
fixes #38393
2017-11-17 11:35:49 +01:00
Joao Moreno 12c41aa9bd Merge branch '34527' of https://github.com/raouldc/vscode into raouldc-34527 2017-11-10 17:03:06 +01:00
Joao Moreno 57b2a86868 Merge branch 'justinhhorner-git-rename-branch' of https://github.com/justinhhorner/vscode into justinhhorner-justinhhorner-git-rename-branch 2017-11-10 16:51:44 +01:00
Joao Moreno 2f3b485b92 compile stuff 2017-11-09 18:32:05 +01:00
Joao Moreno d1b9a70d17 git: data uris 2017-11-09 17:54:00 +01:00
Joao Moreno 948c568872 💄 2017-11-08 12:24:24 +01:00
Joao Moreno 07885099aa Merge branch '31055-Sync-Rebase' of https://github.com/excerebrose/vscode into excerebrose-31055-Sync-Rebase 2017-11-08 12:20:10 +01:00
Matt Bierner b743e245ad Enable strict compilation settings in git extension
Enables strict checks in the git extensions
2017-11-06 13:33:22 -08:00
Benjamin Pasero 1b36db4a99 ⬆️ iconv-lite@0.4.19 2017-11-06 10:51:52 +01:00
Joao Moreno 16692ae72c fixes #37226 2017-11-01 16:08:08 +01:00
Johannes Rieken fe3f6cc861 fix #37331 2017-11-01 15:41:06 +01:00
Johannes Rieken 5efffdfcb4 add git.decorations.enabled setting, #37299 2017-11-01 14:44:50 +01:00
Johannes Rieken 1cafd15b44 fix #37403 2017-11-01 14:18:24 +01:00
Johannes Rieken f502f70345 deco - align git color names 2017-10-30 16:44:51 +01:00
isidor 3e3d09021d also use darker red for git deleted 2017-10-25 17:24:24 +02:00
isidor 5d93cd1543 git color decoration: a bit different colors for light theme 2017-10-25 17:20:44 +02:00
Johannes Rieken a0c26c8a1d deco - show badge in scm viewlet when no icons are provided 2017-10-24 17:58:04 +02:00
Johannes Rieken 5faa72ac39 deco - use a color for ignored files 2017-10-18 09:03:15 +02:00
BattleBas 6c40a968f4 Added setting "git.autoRepositoryDetection"
When opening just one file, the setting "autoRepositoryDetection" allows the user to control whether the entire repository changes will be displayed or just the changes of the current file.
2017-10-12 20:19:07 -05:00
Joao Moreno 3070c0bb66 Merge branch 'dirtydiff' 2017-10-12 16:07:31 +02:00
Johannes Rieken f813a949c1 adjust scm colors 2017-10-12 14:47:02 +02:00
Joao Moreno 7d729c9d17 diff: inline actions 2017-10-11 15:16:47 +02:00
Johannes Rieken a34ee0c5aa label tweak 2017-10-10 17:09:36 +02:00
Johannes Rieken 9c4052804d adjust git colors 2017-10-10 17:09:35 +02:00
Johannes Rieken e73da33e4f add back untracked color, remove suffix for now 2017-10-10 17:09:35 +02:00
Johannes Rieken 73164106d5 simplify git decorations... 2017-10-10 17:09:34 +02:00
Johannes Rieken 5c109769f0 use ColorIdentifier instead of Color, define some git colors for untracked, modifed, and ignored 2017-10-10 17:08:53 +02:00
Joao Moreno bb23d1244e lock git @types deps
related to #35561
2017-10-04 13:38:41 +02:00
Joao Moreno bcb3e0d00e detect conflict markers when staging
fixes #33983
2017-10-03 10:21:20 +02:00
Joao Moreno a13fdcbf50 Repository.close
fixes #35041
2017-09-28 11:09:44 +02:00
Raoul D'Cunha 21aac84936 Add support for Stash (Include Untracked) 2017-09-20 17:06:52 +12:00
isidor 1559b68d09 git: open change enabled only for local files 2017-09-15 10:49:31 +02:00
Joao Moreno b1a7be798e add git.stageAll to provider menu
related to #34230
2017-09-13 09:18:09 +02:00
Joao Moreno c9e070991a remove close repo command 2017-08-31 16:12:10 +02:00
Joao b4fa7f2e27 fixes #33499 2017-08-30 15:25:15 +02:00
Joao 5b265e0cab fixes #33341 2017-08-30 13:02:20 +02:00
Joao 8f8bbff336 fixes #33325 2017-08-29 15:06:57 +02:00
Joao 2624eff8fe Merge branch 'master' into scm-multiroot 2017-08-25 11:36:39 +02:00
Joao Moreno e9798613ad git: gitOpenRepositoryCount 2017-08-23 16:25:20 +02:00
Joao Moreno ca068b3695 fix git.pullFrom group 2017-08-23 15:55:41 +02:00
Justin Horner e34b313026 Merge branch 'master' into justinhhorner-git-rename-branch 2017-08-21 22:51:06 -04:00
Joao Moreno 071652f161 git: improved discard all 2017-08-21 11:48:35 +02:00