133 Commits

Author	SHA1	Message	Date
Joao Moreno	707787c5b8	update yarn.lock files to use integrity	2018-09-30 16:34:43 +02:00
Johannes Rieken	b0787a2b87	fix webpack entries for merge-conflict and search-rg	2018-09-20 09:59:24 +02:00
Alex Dima	34e7a220c8	Avoid shipping unnecessary files	2018-09-19 19:53:46 +02:00
Johannes Rieken	3053689bb5	webpack merge-conflict #57680	2018-09-19 15:19:51 +02:00
Alex Dima	a46554c8fa	Use the fast variant of TextEditor.setDecorations	2018-09-17 17:10:07 +02:00
Alex Dima	c36258d23f	Use const enums (to inline their values in JS)	2018-09-06 20:39:19 +02:00
Johannes Rieken	c2c5819fc8	adopt vscode-nls 4.0.0	2018-09-06 14:44:33 +02:00
Alex Dima	47212be6f3	Settings sweep (#54690)	2018-07-30 12:35:43 +02:00
Greg Van Liew	c150d0d42d	Edit pass on new built-in extension comments (#54277)	2018-07-13 15:28:27 -07:00
Ramya Achutha Rao	f89c16c04c	Standardize readme across built-in extensions #54098	2018-07-11 16:38:32 -07: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	ab7f6e871d	Add link to documentation (#43978)	2018-03-02 11:18:41 +01:00
Greg Van Liew	b3a1b98d54	Edit pass on built-in extension descriptions (#44875)	2018-03-01 16:43:06 -08: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
Matt Bierner	308c1887df	Update extensions for TS 2.7 ... Update src to build with TS 2.7 Explicitly assign this.message in the else body	2018-02-08 14:28:55 -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
Christof Marti	1f064796b8	Register content provider (again) (fixes #40557)	2018-01-10 14:52:52 +01:00
Sergey Kintsel	31baddd594	Fix typo in MergeDecorator class name	2018-01-08 12:09:08 +01:00
Joe Martella	58c1273a04	Adds "Accept All Current" to command palette	2017-11-27 15:48:02 -08:00
Joao Moreno	0a8b6fb706	yarn: replace most shrinkwrap files	2017-11-13 23:03:52 +01:00
Matt Bierner	7ac8e49eb0	Add additional no unused checks for merge-conflict extension	2017-11-07 11:22:08 -08:00
Erich Gamma	b94569fe0d	tslint5 adoption - fix semicolon rule	2017-11-07 12:08:22 +01:00
Matt Bierner	cd00b590a8	Enable strict in a few more extensions	2017-11-06 11:40:05 -08:00
Matt Bierner	0bd33bbd96	Use strict versions for @types. Fixes #35561	2017-10-09 11:21:00 -07:00
Christof Marti	af9f708041	Only register for file: and untitled: (fixes #33133)	2017-08-30 15:39:13 -07:00
Martin Aeschlimann	256b02f921	Merge pull request #31253 from yfdyh000/i18n-fixes ... Fixes some extensions strings missing for i18n	2017-08-28 22:04:39 +02:00
t-amqi	20cf247927	Spelling fixes	2017-08-09 10:41:18 -07:00
YFdyh000	8fc488e097	Fixes some extensions strings missing for i18n	2017-07-22 21:07:27 +08:00
kieferrm	fb52a0e726	remove dev dependencies from shrinkwrap	2017-06-30 11:35:11 -07:00
kieferrm	0edc80db86	add shrinkwrap file for merge-conflict	2017-06-30 10:02:37 -07:00
kieferrm	3f8bd163f4	update dependency on vscode-extension-telemetry	2017-06-30 09:57:37 -07:00
Christof Marti	8da3ea97ab	Use original scheme (fixes #29872)	2017-06-29 12:26:33 -07:00
Michel Kaporin	ab3c945e0e	Import 'nls' in extensions entry point. Fixes #29098.	2017-06-28 16:01:23 +02:00
Christof Marti	1de69f4d8d	Remove merge keyboard shortcuts (fixes #28376)	2017-06-26 11:25:53 -07:00
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
Joao Moreno	5667cc0e69	use vsce to determine what to package when bundling extensions ... fixes #29054	2017-06-21 16:17:21 +02:00
Christof Marti	5b4f203e16	Remove unnecessary dependencies	2017-06-20 14:09:20 -07:00
Christof Marti	e75ff7dc9f	Register regular commands and look up active editor (fixes #27584, fixes #27585)	2017-06-19 18:40:11 -07:00
Christof Marti	996af4d965	Workbench colors (#28507)	2017-06-12 17:21:29 -07:00
Kate Miháliková	ab52889793	Handle diff3-style merge correctly (#27405)	2017-06-12 17:18:10 -07:00
Christof Marti	a88d97d63e	Title case (#27569)	2017-06-02 14:23:48 -07:00