73 Commits

Author	SHA1	Message	Date
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