Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-25 12:47:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,056 Commits 2,500 Branches 340 Tags
8e1bf19f3dbdd06fd8106b5c8a3003ce4efbb94d
Commit Graph

549 Commits

Author SHA1 Message Date
Joao Moreno
fe20886713 don't spawn git on Windows 
fixes #32739
 2017-11-10 17:50:13 +01:00
Joao Moreno
2fedc4c253 git rename: missing update 2017-11-10 17:39:20 +01:00
Joao Moreno
ffefea2053 Merge branch 'fix-changes-display-for-modified-files' of https://github.com/thierer/vscode into thierer-fix-changes-display-for-modified-files 2017-11-10 17:24:28 +01:00
Joao Moreno
c3c4f5e8de 💄 2017-11-10 17:12:28 +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
1a20ec9103 💄 2017-11-10 16:27:56 +01:00
João Moreno
56539e2e25 Merge pull request #32222 from dericcain/master 
Added ability to use tilde as home dir in config for cloning repos
 2017-11-10 16:25:22 +01:00
Joao Moreno
55882309c8 git: cancel clone 
fixes #30057
 2017-11-10 16:22:12 +01:00
Johannes Rieken
5ca4bab8fc use -z --stdin when running check-ignore, qualified guess for #37857 2017-11-10 10:05:01 +01:00
Joao Moreno
2f3b485b92 compile stuff 2017-11-09 18:32:05 +01:00
Joao Moreno
de84b63e47 fix compile error 2017-11-09 18:23:12 +01:00
Joao Moreno
e730a65f7a git image diff: fix index 2017-11-09 18:22:45 +01:00
Joao Moreno
d1b9a70d17 git: data uris 2017-11-09 17:54:00 +01:00
Benjamin Pasero
7f0b0e1761 label/description 2017-11-08 15:48:45 +01:00
Joao Moreno
4b8c0ce265 git: raw buffer 2017-11-08 15:26:41 +01:00
Joao Moreno
d572f43247 wip: git: send pngs as data uris 2017-11-08 12:52:30 +01:00
Joao Moreno
d2016c4ad0 Merge branch 'master' into fix/33739 2017-11-08 12:27:48 +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
Joao Moreno
c432bc46a1 scm: move placeholder format to the outside 2017-11-08 12:14:48 +01:00
Joao Moreno
0a42516de8 Merge branch 'hui/scm-inputbox-placeholder' of https://github.com/huizhougit/vscode into huizhougit-hui/scm-inputbox-placeholder 2017-11-08 12:02:33 +01:00
João Moreno
e4bb48b1fe Merge branch 'master' into git-ext-strict 2017-11-08 10:36:28 +01:00
João Moreno
d901df3fb0 any -> string 2017-11-08 10:34:44 +01:00
Matt Bierner
69832fddf6 use import mocha instead of <reference> for some tests 2017-11-07 14:54:20 -08:00
Matt Bierner
ab1d686a41 Fix a few more errors 2017-11-06 13:43:15 -08: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
Johannes Rieken
ff029d5589 fix #37596 2017-11-03 11:38:12 +01:00
Joao Moreno
58c6729a62 improve git isIdle implementation 
related to #37417
 2017-11-01 16:52:31 +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
bab6929b45 also control icon appearance with git.decorations.enabled setting, #37299 2017-11-01 14:44:50 +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
Joao Moreno
bb12d8de03 fixes #36213 2017-10-30 15:33:57 +01:00
Joao Moreno
63bfb446c4 Revert "dont read XDG_RUNTIME_DIR" 
fixes #22593

This reverts commit 867e521341.
 2017-10-30 15:13:52 +01:00
Joao Moreno
14064340e8 fixes #36984 2017-10-30 12:09:51 +01:00
Joao Moreno
d5c3e6b75a git: use resource configuration 
related to #37041
 2017-10-27 16:21:21 +02:00
João Moreno
d3028fb5ca Merge pull request #36974 from keegancsmith/fetch-noop 
git: Throw fetch error
 2017-10-27 15:48:15 +02:00
João Moreno
178d05621f Merge pull request #36971 from keegancsmith/git-error-to-string 
git: Include GitErrorData in GitError.toString
 2017-10-27 12:13:35 +02:00
Johannes Rieken
6c09f4aafc don't report progress when running check-ignore, #36754 2017-10-27 11:15:28 +02:00
Johannes Rieken
47e1c93285 deco - use correct/overwrite decorations in scm viewlet because the same URI can have multiple decorations 2017-10-26 17:01:18 +02:00
Johannes Rieken
86cd46a44e deco - allow to derive new decoration from existing decoration, add IDecorationData#source 2017-10-26 17:01:18 +02:00
Keegan Carruthers-Smith
fb47be0fa1 git: Throw fetch error 2017-10-26 12:26:46 +02:00
Keegan Carruthers-Smith
16089481f0 git: Include GitErrorData in GitError.toString 
We are passing `GitErrorData` to `JSON.stringify` to include in the string
generated by `GitError.toString`. However, we set `replacer` to `[]`, which
means `JSON.stringify` will _always_ serialize to `{ }`. After this change
GitError messages should be more understandable, and not just say `Failed to
execute git`.
 2017-10-26 11:32:48 +02: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
51fa1659ac deco - priority 2017-10-25 09:38:22 +02:00