microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-08 02:24:51 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity
27,584 Commits 4,401 Branches 375 Tags
d49ea348ff3502fd67921b392d66052257aaa673
Commit Graph

27584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Dima
d49ea348ff Merge branch 'master' of https://github.com/Microsoft/vscode 2017-12-15 16:20:02 +01:00
Joao Moreno
195c346f06 💄 2017-12-15 16:18:05 +01:00
Joao Moreno
eb43c80ecc 💄 2017-12-15 16:17:39 +01:00
Joao Moreno
bf741a1afd Merge branch 'fix/39738' of https://github.com/pfongkye/vscode into pfongkye-fix/39738 2017-12-15 16:14:47 +01:00
Joao Moreno
468dd75abf Merge remote-tracking branch 'origin/master' 2017-12-15 16:12:32 +01:00
Joao Moreno
938dc015d2 💄 2017-12-15 16:12:15 +01:00
Alex Dima
198667a8f1 Add option to disable sourcemaps for those in a hurry 2017-12-15 16:07:15 +01:00
Joao Moreno
2be2eac637 Merge branch 'show_scm_providers' of https://github.com/shivammittal99/vscode into shivammittal99-show_scm_providers 2017-12-15 16:07:04 +01:00
Alex Dima
197b7a1788 Merge branch 'master' of https://github.com/Microsoft/vscode 2017-12-15 16:00:58 +01:00
João Moreno
bed86d2b63 Merge pull request #39216 from Dozed12/master 
Show branches list in "git pull from"
 2017-12-15 16:00:36 +01:00
Alex Dima
17bda4b25c Do not write .d.ts files to disk, as they are not needed there 2017-12-15 15:58:58 +01:00
João Moreno
8f76a4d0d3 Merge pull request #38563 from graknol/master 
Git branches sorted by committerdate, latest first.
 2017-12-15 15:51:10 +01:00
Joao Moreno
588eb52b33 remove unecessary | undefined 2017-12-15 15:46:13 +01:00
Joao Moreno
374920a139 Merge branch 'status' of https://github.com/nicksnyder/vscode into nicksnyder-status 2017-12-15 15:45:11 +01:00
Joao Moreno
55ae7e5cd5 git: fix opening deleted file 2017-12-15 15:44:06 +01:00
Joao Moreno
f6ee190cf7 fixes #36885 2017-12-15 15:39:01 +01:00
Martin Aeschlimann
f871695b39 [file icon] file icons for JSONC files. Fixes #40244 2017-12-15 15:32:02 +01:00
Martin Aeschlimann
354a8cd414 [html/json] set language server debug ports 2017-12-15 15:32:02 +01:00
Martin Aeschlimann
f3f11cfbbf [json] increase validationDelay 2017-12-15 15:32:01 +01:00
Martin Aeschlimann
fbcd6e5dfe [html] increase validationDelay 2017-12-15 15:32:01 +01:00
Martin Aeschlimann
4cc86dd8c6 Slow IntelliSense in files with 4000+ lines. Fixes #39994 2017-12-15 15:32:01 +01:00
Joao Moreno
19c15cc5d0 Merge remote-tracking branch 'origin/master' 2017-12-15 15:23:12 +01:00
Joao Moreno
920a282c16 just move a single repository up 2017-12-15 15:21:31 +01:00
Alex Dima
52c252b8c9 Remove unused code 2017-12-15 06:12:41 -08:00
Joao Moreno
71701f982d Merge branch 'repo-rank' of https://github.com/keegancsmith/vscode into keegancsmith-repo-rank 2017-12-15 15:05:13 +01:00
Martin Aeschlimann
be686e07f6 Merge pull request #40292 from TeeSeal/master 
Update Ruby indent pattern
 2017-12-15 15:00:56 +01:00
Johannes Rieken
05c9c533f6 MainThreadLanguageFeaturesShape, #40169 2017-12-15 14:21:00 +01:00
TeeSeal
ba61d8886c Also ignore special characters for comments 2017-12-15 14:32:49 +02:00
TeeSeal
349f871af2 Update Ruby indent pattern 2017-12-15 13:53:09 +02:00
Johannes Rieken
96ac39f68f debt - less TPromise<any> in extHost.protocol 2017-12-15 12:10:23 +01:00
Johannes Rieken
cd4b141302 debt - less TPromise<any> in extHost.protocol 2017-12-15 12:10:23 +01:00
isidor
8b35e5037d debug: restart debugging should not reuse session id 
fixes #39371
 2017-12-15 11:36:31 +01:00
Sandeep Somavarapu
20b3ee42d8 Fix #40281 2017-12-15 11:36:06 +01:00
Johannes Rieken
966100d9fa Only accept WorkspaceEdit, #34664 2017-12-15 11:25:29 +01:00
Sandeep Somavarapu
eb1f87c452 #40169 Remove reference to custom marshaller 2017-12-15 11:15:30 +01:00
Alex Dima
78d927d647 Don't use custom marshaller for ext host init data (#40169) 2017-12-15 11:09:34 +01:00
Joao Moreno
f046bda260 remove custom marshaller 
related to #40169
 2017-12-15 11:08:36 +01:00
Dirk Baeumer
4a7ec03c31 Log stdout if JSON.parse fails 2017-12-15 10:42:08 +01:00
Dirk Baeumer
fa61ea9c06 Fixes #40228: code --status doesn't work if your shell is PowerShell 2017-12-15 10:38:52 +01:00
Joao Moreno
9622ada626 find git in LocalAppData and PATH, win32 
fixes #40229
 2017-12-15 10:38:02 +01:00
Johannes Rieken
4e5de4b71b debounce and queue decoration request, fixes #40210 2017-12-15 10:33:22 +01:00
Johannes Rieken
6cb8c4c715 Revert "only listen after getting data once, #40210" 
This reverts commit 20adb31b67.
 2017-12-15 10:33:22 +01:00
Sandeep Somavarapu
059b634d51 Fix warning 2017-12-15 09:53:43 +01:00
Sandeep Somavarapu
5a6e8dc0d3 #40169 Remove usage of custom marshaller 2017-12-15 09:48:57 +01:00
Joao Moreno
9a5e8b3ae5 fixes #40261 2017-12-15 08:27:51 +01:00
Benjamin Pasero
9a34f5ae30 Add cp936 encoding (for #39664) 2017-12-15 07:42:56 +01:00
Daniel Imms
08ec16001a Merge pull request #38287 from martellaj/joem/issue-36271 
Adds "copy on select" feature (with setting)
 2017-12-14 20:04:34 -08:00
Rob Lourens
91c8e61eea Merge pull request #40142 from Microsoft/roblou/extHostLogger2 
Expose log level and log path to extensions
 2017-12-14 16:12:22 -08:00
Rob Lourens
206b62db8d Slightly better "logger" comment 2017-12-14 16:11:12 -08:00
Ramya Achutha Rao
5503b0b92f Avoid emmet when typing css property values Fixes #34162 2017-12-14 16:02:52 -08:00