Commit Graph

723 Commits

Author SHA1 Message Date
Joao Moreno
b920ce8583 💄 2018-09-12 14:54:22 +02:00
Joao Moreno
f82fcb8a0b Merge commit 'refs/pull/55976/head' of github.com:Microsoft/vscode into pr/55976 2018-09-12 14:50:03 +02:00
João Moreno
24d9eeb9a8 Merge pull request #54867 from Hirico/master
Preserve the revealed area after using "Open File" from git-diff editor (fix #53465)
2018-09-12 12:22:06 +02:00
Joao Moreno
405e853713 💄 2018-09-12 12:03:08 +02:00
Joao Moreno
fa1deaaa34 Merge commit 'refs/pull/52527/head' of github.com:Microsoft/vscode into pr/52527 2018-09-12 12:01:51 +02:00
Joao Moreno
7ffa9219ae fixes #52037 2018-09-12 11:55:21 +02:00
Joao Moreno
07e7dac2e7 💄 2018-09-12 11:40:25 +02:00
Joao Moreno
f1ef0a7fbe Merge commit 'refs/pull/51111/head' of github.com:Microsoft/vscode into pr/51111 2018-09-12 11:30:29 +02:00
Joao Moreno
f92afbdc3c git: mergebase is a readonly operation 2018-09-11 11:46:02 +02:00
Joao Moreno
dec5ac9811 missing git api call forwarding 2018-09-10 15:26:57 +02:00
Alex Dima
c36258d23f Use const enums (to inline their values in JS) 2018-09-06 20:39:19 +02:00
Joao Moreno
ad58b37dc2 fixes #53520 2018-09-06 15:23:32 +02:00
Joao Moreno
10e0a22f6d fixes #56015 2018-08-29 13:22:59 +02:00
Joao Moreno
200a7185a0 related to #57224 2018-08-27 16:57:29 +02:00
Joao Moreno
6e909d4132 git: expose error codes in API 2018-08-24 12:24:37 +02:00
Joao Moreno
103715c3cc git: implement API 2018-08-24 12:04:29 +02:00
Joao Moreno
28d2b5d2d6 wip: git api 2018-08-24 11:19:05 +02:00
Joao Moreno
811a6be05b 💄 2018-08-24 11:16:49 +02:00
Joao Moreno
6d2598ad88 git api: repository state 2018-08-24 11:16:49 +02:00
Joao Moreno
a9bc997f23 git api: remotes 2018-08-22 15:38:16 +02:00
Joao Moreno
1845bc3a64 git api: onDidRunGitStatus 2018-08-22 15:26:49 +02:00
Joao Moreno
78d61d55f4 git: use simpler versioning scheme 2018-08-22 15:09:11 +02:00
Joao Moreno
f9982d29d4 git api: make cwd mandatory 2018-08-22 13:06:26 +02:00
Joao Moreno
a49378e26c git: cleaner exports 2018-08-22 12:57:05 +02:00
Joao Moreno
8983d89550 git extension: expose exec/spawn 2018-08-22 12:34:54 +02:00
Joao Moreno
456437dfaa git: api 1 2018-08-22 11:30:07 +02:00
Joao Moreno
ec1c4aeaf5 git api: expose repositories 2018-08-22 11:25:42 +02:00
Joao Moreno
cc5e8c15bf git api 2018-08-21 17:04:07 +02:00
Joao Moreno
257878e3b1 git api: deprecation 2018-08-21 16:41:34 +02:00
Joao Moreno
b00d1b40bc git api: expose gitPath 2018-08-21 16:41:29 +02:00
Joao Moreno
ad4fecadeb git: getAPI 2018-08-21 16:04:00 +02:00
Joao Moreno
0633c77f80 api.d.ts 2018-08-21 12:04:52 +02:00
Joao Moreno
a8deffb86a remove unused code 2018-08-21 12:04:47 +02:00
Johannes Rieken
64b82b2a35 Merge branch 'master' into joh/extpack 2018-08-16 10:07:18 +02:00
Benjamin Pasero
b57003f330 NodeBuffer => Buffer 2018-08-16 07:38:54 +02:00
Johannes Rieken
1b9ede3021 Merge branch 'master' into joh/extpack 2018-08-15 13:55:12 +02:00
Johannes Rieken
0ed7b0e701 rename abbreviation to letter, #54938 2018-08-15 10:48:09 +02:00
wistcc
4e3f1e2a5e Addressing feedback 2018-08-08 10:31:53 -04:00
wistcc
06447486bb Merge branch 'master' into WC/55376 2018-08-07 22:45:56 -04:00
wistcc
64076e6d66 Adding the git.showStagedChangesResourceGroup config property 2018-08-07 22:41:34 -04:00
Johannes Rieken
34159e797b adding webpack.config.js 2018-08-07 17:07:01 +02:00
Joao Moreno
9682614323 fixes #55122 2018-08-02 14:26:32 +02:00
Eric Gang
ebf16df683 Fix a compiler error
I didn't notice the preservation should be put under a condition
2018-07-24 14:26:13 +08:00
Eric Gang
dd1cbbecfd Reserve revealed editor area after using git diff
fix the issue #53465
2018-07-23 20:59:36 +08:00
Joao Moreno
bcdad4c79f fixes #53520 2018-07-18 11:12:06 +02:00
Joao Moreno
044d192df0 remove bad timeout 2018-07-10 18:15:21 +02:00
Joao Moreno
6957a5c058 make git activation async
fixes #50292
2018-07-10 12:37:25 +02:00
Joao Moreno
19df280c7f fixes #53849 2018-07-09 10:37:51 +02:00
Joao Moreno
ee0a7a265d Merge branch 'master' of github.com:Microsoft/vscode 2018-07-09 10:15:59 +02:00
Joao Moreno
b18b795936 fixes #53668 2018-07-09 10:15:55 +02:00