Commit Graph

20595 Commits

Author SHA1 Message Date
Christof Marti d9d481afcd Fix background decorations (fixes #28368) 2017-06-26 11:14:30 -07:00
Christof Marti f7f7d7400d Support GNU patch --merge results (fixes #28360) 2017-06-26 10:18:41 -07:00
Ramya Achutha Rao 99ffa6afcf Move state check ahead to ensure stale docs are not made visible #29468 2017-06-26 10:14:35 -07:00
Ramya Achutha Rao 8ace8efaf9 Use new emmet for all emmet actions other than expand and wrap abbr 2017-06-26 10:14:35 -07:00
Ramya Achutha Rao 868b82089c Pass syntax from core to Wrap Abbr just like Expand Abbr 2017-06-26 10:14:35 -07:00
Christof Marti 7eda8927b1 Only show when Emmet commands are shown (#27890) 2017-06-26 10:09:53 -07:00
rebornix 62ed7707ef while handling onEnter for for moving lines, we still need to handle decrease indent for moving line. 2017-06-26 09:54:34 -07:00
rebornix b166434ef0 Fix #29457. While moving lines with indentation adjustment, we should not ignore empty last line. 2017-06-26 09:54:34 -07:00
Alex Dima 5a2c2c4962 Improve clicking targets, add a key to hide the diff review pane 2017-06-26 18:48:47 +02:00
Alex Dima e02d85d8cc Have the diff review pane follow the modified editor selection 2017-06-26 18:48:41 +02:00
isidor 879a30a4da explorer: gracefully fail when folder not available 2017-06-26 18:12:07 +02:00
Alex Dima 39319a3b17 aria roles and labels for diff review pane 2017-06-26 17:58:32 +02:00
Sandeep Somavarapu f8009e3dba Fix #27607 2017-06-26 17:53:14 +02:00
Sandeep Somavarapu 0e96d1b5a6 Fix #28888 2017-06-26 17:53:14 +02:00
Joao Moreno 5543d9524b Merge branch 'Krzysztof-Cieslak-debugger_type_in_extension_view' 2017-06-26 17:32:24 +02:00
Alex Dima 91bd7367ef Add mouse & keyboard handling to the diff review pane 2017-06-26 17:31:38 +02:00
Joao Moreno a20c5a7907 Merge branch 'debugger_type_in_extension_view' of https://github.com/Krzysztof-Cieslak/vscode into Krzysztof-Cieslak-debugger_type_in_extension_view 2017-06-26 17:30:57 +02:00
Daniel Imms 246fe31f7f Add Tyriar to hot-exit label 2017-06-26 08:28:34 -07:00
Benjamin Pasero c256fd45ee I will regret this 2017-06-26 17:27:21 +02:00
Benjamin Pasero f124c9a043 fix potential npe 2017-06-26 17:25:49 +02:00
Joao Moreno 93a3cc9208 add joaomoreno to github classifier 2017-06-26 17:19:20 +02:00
Alex Dima 2dd9270370 Don't use a table for the DiffReview 2017-06-26 16:56:47 +02:00
Joao Moreno da212874ad Revert "remove translate3d from list"
This reverts commit 4b11ad07a9.
2017-06-26 16:36:40 +02:00
isidor e98ba9aa96 null guard 2017-06-26 16:25:09 +02:00
Joao Moreno 4b11ad07a9 remove translate3d from list
fixes #29465
2017-06-26 16:22:27 +02:00
isidor 428013544d auto assign debug to isidorn 2017-06-26 16:17:47 +02:00
Joao Moreno ef3c40b658 Merge branch 'Duroktar-feature-git-open-old-file' 2017-06-26 16:14:43 +02:00
Joao Moreno 91a02c7a0a 💄 2017-06-26 16:14:29 +02:00
Joao Moreno 2f54b0001b Merge branch 'feature-git-open-old-file' of https://github.com/Duroktar/vscode into Duroktar-feature-git-open-old-file 2017-06-26 16:09:44 +02:00
Johannes Rieken 4ae087aeec Merge pull request #29034 from felixfbecker/throw-errors
Always reject Promises with Error instances
2017-06-26 16:04:12 +02:00
Alex Dima ed0af087a2 use lower-case beforeend 2017-06-26 16:01:57 +02:00
Joao Moreno 1ddb5cc1ff Merge remote-tracking branch 'origin/master' 2017-06-26 15:49:21 +02:00
Joao Moreno 417cdb62b7 git.pullFrom
octopus commit
2017-06-26 15:46:51 +02:00
Benjamin Pasero 30cf7121fd 💄 2017-06-26 15:46:31 +02:00
Michel Kaporin 112bde340f Do not screenshot until webdriver result is available. 2017-06-26 15:42:19 +02:00
Benjamin Pasero 458841885b 💄 2017-06-26 15:40:29 +02:00
Alex Dima 1dd9b04167 Render diff headers, fix copyright headers 2017-06-26 15:38:04 +02:00
Joao Moreno 5f31035e46 Merge branch 'git_pull_from' of https://github.com/Krzysztof-Cieslak/vscode into Krzysztof-Cieslak-git_pull_from 2017-06-26 15:36:17 +02:00
Joao Moreno 53ce1b0b46 Merge branch 'master' of https://github.com/matthewshirley/vscode into matthewshirley-master 2017-06-26 15:36:00 +02:00
Joao Moreno 14380f9766 Merge branch 'bc/Feature26738' of https://github.com/BugraC/vscode into BugraC-bc/Feature26738 2017-06-26 15:34:26 +02:00
Sandeep Somavarapu 63d1865fb5 Fix #28888 2017-06-26 15:33:15 +02:00
Felix Becker dbe0f89264 Always reject Promises with Error instances 2017-06-26 15:24:41 +02:00
Alex Dima 676ff7d699 Restore mocha --browser 2017-06-26 15:16:34 +02:00
Alex Dima eafce4526e Add a diff review pane 2017-06-26 15:16:34 +02:00
Joao Moreno d252d2fe10 Merge branch 'master' of github.com:Microsoft/vscode 2017-06-26 15:16:04 +02:00
Joao Moreno f7aac1ba7e fixes #29429 2017-06-26 15:15:54 +02:00
isidor 0a32abf280 null check for no folder workspace 2017-06-26 15:10:25 +02:00
isidor d03974b506 multi root: launch and tasks read the master for now 2017-06-26 15:04:10 +02:00
isidor 2b5c249a08 debugConfigManager: destructure import 2017-06-26 15:04:10 +02:00
Felix Becker d0a6cc2715 Add type constraint to wrapError 2017-06-26 15:02:52 +02:00