Robo
bce4d71f64
chore: bump node@14.x in devDependencies ( #122905 )
2021-05-04 10:04:13 +02:00
Sandeep Somavarapu
68bed01970
adopt virtual workspaces - not supported
2021-04-22 16:54:06 +02:00
SteVen Batten
f9fc28d47d
update ext manifest schema validation and built-in exts
2021-04-21 11:54:42 -07:00
Miguel Solorio
ac48f78dd6
Add icons for built-in extensions ( fixes #81760 )
2021-04-20 12:09:24 -07:00
Christof Marti
75f2ce9735
Adopt workspaceTrust
2021-04-13 21:42:54 +02:00
Christof Marti
5c79571610
Add next/prev conflicts ( #97613 )
2021-03-31 10:46:11 +02:00
Wenlu Wang
96d0dc4154
Add next/prev conflicts ( #97613 )
2021-03-31 10:45:21 +02:00
João Moreno
ec805db5ed
add repository field to extensions package.json
2021-01-29 15:30:45 +01:00
Christof Marti
b33b28dd07
Activate onStartupFinished ( #110031 )
2021-01-12 08:17:35 +01:00
Alexandru Dima
f74ad9692f
Align @types/*
dev dependencies ( #112718 )
2020-12-18 13:28:39 +01:00
Martin Aeschlimann
058e1095b2
fix merge-conflict browser main
2020-06-26 11:14:23 +02:00
Martin Aeschlimann
ae1599a0b7
fix merge-conflict for browser
2020-06-26 10:54:29 +02:00
Martin Aeschlimann
16be2c9885
used shared webpack-config for browser
2020-06-25 23:22:02 +02:00
Martin Aeschlimann
d78d88f7a8
make merge-conflic serverless
2020-06-12 11:03:52 +02:00
Benjamin Pasero
ca22de4b17
debt - bump node.d.ts dependency in extensions to 12.x (part of #82514 )
2019-10-28 08:11:47 +01:00
Aurélien Pupier
7a5bca9faf
Add License field to package.jsons #68423 ( #68771 )
...
it should avoid to have "warning XXX: No license field" during yarn
build
Signed-off-by: Aurélien Pupier <apupier@redhat.com>
2019-06-06 11:44:50 +02:00
Benjamin Pasero
d78a75973c
update @types/node ( #74881 )
2019-06-05 10:20:01 +02:00
Benjamin Pasero
d7977c880f
debt - use @types/node: 10 for all extensions
2019-06-05 09:32:36 +02:00
Matt Bierner
c69c1719bb
Add enumDescriptions for merge-conflict.diffViewPosition
...
Fixes #74500
2019-05-28 14:54:29 -07:00
Peng Lyu
c3fe962b89
Open the diff view in current editor, to the side or below.
2019-05-24 15:26:50 -07:00
Peng Lyu
9cd81dcb5b
Always compare change with context.
2019-05-24 14:43:44 -07:00
Peng Lyu
b917a0341d
Support open diff in new editor group
2019-05-24 11:29:30 -07:00
Peng Lyu
fa69b4e7d6
Show context for diff view of merge conflict and introduce compareAll.
2019-05-23 14:19:09 -07:00
Christof Marti
1d40f3f25c
Off by default ( #45853 )
2018-10-02 16:00:43 +02:00
Christof Marti
977fc70d40
Merge branch 'master' into Issue-#45853-checked
2018-10-02 15:57:39 +02:00
mnikn
0a5343aa97
implement [ #53133 ]( https://github.com/Microsoft/vscode/issues/53133 )
2018-10-01 16:42:06 +02:00
Johannes Rieken
c2c5819fc8
adopt vscode-nls 4.0.0
2018-09-06 14:44:33 +02:00
Dirk Baeumer
21991b4912
Move to latest vscode-nls for corrupted cache support
2018-07-03 16:12:52 +02:00
atomai
7c26e93b21
Automatically navigate to the next merge conflict upon resolving a merge conflict
2018-04-14 20:03:55 -04:00
Christof Marti
a83ea2b316
Bump version ( #43978 )
2018-02-27 15:56:35 +01:00
Christof Marti
264d0c2ec8
Name, description, icon for merge-conflict extension ( #43978 )
2018-02-26 09:48:34 +01:00
Ramya Achutha Rao
c1ee104fd4
Use latest version of telemetry module
2018-02-23 14:57:27 -08:00
Ramya Achutha Rao
ad06c9c609
Update telemetry module
2018-02-17 17:27:09 -08:00
Ramya Achutha Rao
994bfe6903
Update telemetry module to fix issue of missing version in events
2018-02-13 17:07:30 -08:00
Dirk Baeumer
e91b851ca8
Upgrade to latest language pack format
2018-01-30 00:11:57 +01:00
Ramya Achutha Rao
71c3b15465
Update the telemetry module used by extensions
2018-01-29 14:53:24 -08:00
Dirk Baeumer
04594c864b
Add support for Language Packs
2018-01-25 21:14:34 +01:00
Christof Marti
ec1924769c
Add alias for commands ( #39778 )
2018-01-16 11:05:00 +01:00
Joe Martella
58c1273a04
Adds "Accept All Current" to command palette
2017-11-27 15:48:02 -08:00
Matt Bierner
0bd33bbd96
Use strict versions for @types. Fixes #35561
2017-10-09 11:21:00 -07:00
YFdyh000
8fc488e097
Fixes some extensions strings missing for i18n
2017-07-22 21:07:27 +08:00
kieferrm
3f8bd163f4
update dependency on vscode-extension-telemetry
2017-06-30 09:57:37 -07:00
Christof Marti
1de69f4d8d
Remove merge keyboard shortcuts ( fixes #28376 )
2017-06-26 11:25:53 -07:00
Christof Marti
5b4f203e16
Remove unnecessary dependencies
2017-06-20 14:09:20 -07:00
Phil Price
61a8de29c3
Remove proposed api references, update configuration title localization.
2017-05-23 11:54:43 -07:00
Phil Price
8f4e1f532d
Update extension configuration options
2017-05-23 09:50:23 -07:00
Phil Price
83fd45c45d
Command titles and category localization support
2017-05-22 14:04:51 -07:00
Phil Price
61f16319ab
Initial merge of 'better-merge' extension into core extensions.
...
- 'better-merge' command and setting namespace replaced with 'merge-conflict'
- Configuration settings from extension replaced with single 'merge-conflicts.enabled' : boolean setting
2017-05-22 13:56:18 -07:00