Commit Graph

39655 Commits

Author SHA1 Message Date
Joao Moreno
a6985d76b2 Merge commit 'refs/pull/58174/head' of github.com:Microsoft/vscode into pr/58174 2018-09-13 17:20:52 +02:00
Joao Moreno
583f9e19c7 Merge branch 'pr/53286' 2018-09-13 17:15:30 +02:00
Joao Moreno
4d46fb709c cleanup git push force 2018-09-13 17:15:21 +02:00
Joao Moreno
aac29b412c 💄 2018-09-13 17:03:25 +02:00
Joao Moreno
9380225465 fix compilation errors 2018-09-13 17:02:49 +02:00
Joao Moreno
eaf1759f29 Merge commit 'refs/pull/53286/head' of github.com:Microsoft/vscode into pr/53286 2018-09-13 17:01:23 +02:00
Sandeep Somavarapu
5eb9eb9474 Fix #58583 2018-09-13 16:39:28 +02:00
Sandeep Somavarapu
2db7cebd25 Merge pull request #58591 from Microsoft/sandy081/58434
Introduce --force arg to install extension without prompts
2018-09-13 16:18:10 +02:00
Joao Moreno
4b2df59105 Merge branch 'pr/54300' 2018-09-13 16:07:41 +02:00
Joao Moreno
ca7ae00825 💄 2018-09-13 16:07:30 +02:00
Martin Aeschlimann
5553d6e045 html: fix test script 2018-09-13 16:05:39 +02:00
Joao Moreno
9c06533ace Merge commit 'refs/pull/54300/head' of github.com:Microsoft/vscode into pr/54300 2018-09-13 15:55:04 +02:00
João Moreno
bc4c7ccb64 Merge pull request #51235 from 1AmNegan/keybinding-next-change-fix
Center viewport for nextChange/previousChange using keybinding
2018-09-13 15:51:13 +02:00
Jason Bright
86230c239c Git rebase detection (#57651)
* Test #57299 - script to stage test data.

* Fix #57299 - improve git rebase detection

* Revert "Test #57299 - script to stage test data."

This reverts commit 5f7142c25a.
2018-09-13 15:47:05 +02:00
Alex Dima
a43df64f74 Fixes #55415 2018-09-13 15:42:43 +02:00
Joao Moreno
44f8dfb5ce Merge branch 'pr/50712' 2018-09-13 15:36:12 +02:00
Joao Moreno
6c504e7ee3 💄 2018-09-13 15:35:58 +02:00
Joao Moreno
406f710b39 Merge commit 'refs/pull/50712/head' of github.com:Microsoft/vscode into pr/50712 2018-09-13 15:25:42 +02:00
Alex Dima
22fcd4cfc0 Fixes #22760 2018-09-13 15:24:07 +02:00
Andre Weinand
1007e69a1e support remove event in LoadedScriptes; fixes #57546 2018-09-13 15:13:33 +02:00
Johannes Rieken
55d197914a breadcrumbs - add telemetry for select and open scenarios. 2018-09-13 14:58:05 +02:00
Johannes Rieken
f16f8b3677 snippets - 💄 2018-09-13 14:44:11 +02:00
João Moreno
d9e06518f1 Merge pull request #57374 from Protolane/enhancement/replace-brackets-too-upon-creating-new-branch
#57373 Replace brackets as well upon creating a branch
2018-09-13 14:35:54 +02:00
João Moreno
a5c6208343 Merge pull request #56943 from jats22/46123
Fix #46123 : Remove absolute path for python
2018-09-13 14:33:28 +02:00
Joao Moreno
bb23217d1e Merge branch 'linux-url-handler' 2018-09-13 14:27:43 +02:00
Alex Dima
f5600ffa1a Fixes Microsoft/monaco-editor#1063 2018-09-13 13:18:21 +02:00
Erich Gamma
8330a69571 fixing web packing 2018-09-13 12:59:24 +02:00
Andre Weinand
1a1171842a support to return null from resolveDebugConfiguration; fixes #54213 2018-09-13 12:51:05 +02:00
Sandeep Somavarapu
1f11d2017e Merge pull request #58517 from Microsoft/sandy081/51796
Customising activity bar icon colors
2018-09-13 12:50:03 +02:00
Sandeep Somavarapu
1731b1c0ad Focus output panel 2018-09-13 12:49:33 +02:00
Sandeep Somavarapu
63d293ee9c Revert "Focus output panel"
This reverts commit da0b574446.
2018-09-13 12:49:12 +02:00
Sandeep Somavarapu
da0b574446 Focus output panel 2018-09-13 12:46:42 +02:00
Benjamin Pasero
f8da5375f9 fix #58592 2018-09-13 12:45:08 +02:00
Sandeep Somavarapu
1dd732608f Introduce --force arg to install extension without prompts 2018-09-13 12:14:37 +02:00
Benjamin Pasero
9c882c7c93 fix #36951 2018-09-13 12:01:14 +02:00
Johannes Rieken
f1962fe5ad webpack - use mainFields: ['module', 'main'] for everyone 2018-09-13 11:48:06 +02:00
Sandeep Somavarapu
1d5d013883 Clean up: remove background colour option from composite bar actions 2018-09-13 11:43:02 +02:00
Johannes Rieken
5b223a4529 debt - nicer regex for fwd and bwd slashes 2018-09-13 11:37:39 +02:00
João Moreno
a7537ab306 remove proposed api usage 2018-09-13 11:37:34 +02:00
Sandeep Somavarapu
2abf78e978 Dervie the color while registering 2018-09-13 11:32:06 +02:00
Sandeep Somavarapu
39b0433444 Clean up: Panel provides backgrond and foreground and Activity bar provides foreground 2018-09-13 11:25:25 +02:00
Joao Moreno
3eac4d8e3e linux: set desktopName for url handling 2018-09-13 11:19:59 +02:00
Joao Moreno
0ac298f773 replace url protocol in code-url-handler 2018-09-13 11:14:47 +02:00
Joao Moreno
60e2737540 cleanup linux gulpfile 2018-09-13 11:14:33 +02:00
Joao Moreno
6b20b45809 Merge commit 'refs/pull/56727/head' of github.com:Microsoft/vscode into pr/56727 2018-09-13 11:05:15 +02:00
Alex Dima
7465e3a35a Fixes #58254: better logic for restoring top of viewport 2018-09-13 11:03:55 +02:00
Benjamin Pasero
80a9557b4a fix #30770 2018-09-13 10:49:09 +02:00
Benjamin Pasero
26d471d479 fix #58520 2018-09-13 10:08:05 +02:00
Martin Aeschlimann
cb66c137e0 Merge pull request #58544 from Microsoft/misolori/folding-resize
Allow folding icons to match editor.fontSize
2018-09-13 09:16:36 +02:00
Miguel Solorio
3da2f86e4d Merge pull request #58558 from Microsoft/misolori/list-light-theme
Update Light theme list colors for color contrast
2018-09-12 23:04:56 -07:00