2105 Commits

Author	SHA1	Message	Date
Amy Qiu	adfa422641	Fix conflicts	2017-08-21 11:44:46 -07:00
Amy Qiu	ead952302a	Integrate native module for WindowsShellHelper	2017-08-21 11:43:35 -07:00
Daniel Imms	97b3b90ada	node-pty@0.7.0 ... Fixes #32802 Fixes #31090	2017-08-21 10:30:09 -07:00
Daniel Imms	04f22441c6	Merge remote-tracking branch 'origin/master' into tyriar/electron-1.7.5	2017-08-20 16:35:38 -07:00
Daniel Imms	441d6c7bd6	Merge pull request #32809 from Microsoft/tyriar/xterm-v3 ... Pull in xterm.js v3 refactor	2017-08-18 17:49:41 -07:00
Alex Dima	728507a850	Update to native-watchdog@0.2.0 (fixes #32620)	2017-08-18 11:16:31 +02:00
Daniel Imms	eee02ecda2	Uplevel xterm.js ... This pulls many changes from the v3 branch. Fixes #32725	2017-08-17 08:56:07 -07:00
Daniel Imms	49001c508d	Bump electron version to 1.7.5	2017-08-16 11:30:33 -07:00
Benjamin Pasero	37703a6602	Revert "update distro" ... This reverts commit 2626251db8.	2017-08-15 23:11:10 +02:00
Benjamin Pasero	2626251db8	update distro	2017-08-15 12:12:41 +02:00
Alex Dima	0a4b9f324a	Add a watchdog mechanism to detect when the extension host JavaScript event loop is unresponsive (#26445)	2017-08-14 12:15:16 +02:00
Rob Lourens	113737877e	Merge pull request #31942 from Microsoft/electron/1.7.4 ... Electron 1.7.x	2017-08-11 18:20:13 -07:00
Christof Marti	23ca41bc4f	keytar should be a regular dependency	2017-08-11 12:45:20 -07:00
Rob Lourens	1180fa8e4d	Merge branch 'master' into electron/1.7.4	2017-08-11 12:11:30 -07:00
kieferrm	42f932bd34	updating distro reference	2017-08-09 09:18:35 -07:00
Rob Lourens	48ed021dc5	Merge branch 'master' into electron/1.7.4	2017-08-08 07:21:28 -07:00
Rob Lourens	05fc36e170	Update yauzl and vscode-ripgrep	2017-08-07 14:07:19 -07:00
kieferrm	a691a0e25c	bump vscode version	2017-08-04 15:48:36 -07:00
kieferrm	1af52c0470	update distro reference	2017-08-03 19:51:16 -07:00
Ramya Achutha Rao	a7c10fea15	Update distro commit hash	2017-08-03 16:40:53 -07:00
Christof Marti	f77b8801ee	OSS tool update	2017-08-03 15:13:49 -07:00
Ramya Rao	593ecbef58	Deprecating old emmet (#31783) ... * Deprecate old emmet * Update translations	2017-07-31 15:59:59 -07:00
Johannes Rieken	5f118f0296	more precise mksnapshot version, tho doesn't help...	2017-07-26 11:12:21 +02:00
Johannes Rieken	73e4a1c1c3	bump electron-snapshot version	2017-07-26 09:50:51 +02:00
Andre Weinand	048012e4d2	update to DAP 1.22.0	2017-07-25 22:17:38 +02:00
Daniel Imms	4f0c0b9e76	Merge remote-tracking branch 'origin/master' into electron/1.7.4	2017-07-24 15:46:11 -07:00
Christof Marti	9fd7e0a89d	Make keytar a required dependency	2017-07-21 14:46:12 -07:00
Daniel Imms	1ceb20bf17	Merge remote-tracking branch 'origin/master' into electron/1.7.4	2017-07-19 20:56:35 -07:00
Christof Marti	b357df0707	Proposed credentials API: Fix linux builds	2017-07-18 18:40:20 -07:00
Christof Marti	a6a07a74e0	Proposed credentials API	2017-07-18 14:55:07 -07:00
Daniel Imms	00493873c6	Merge remote-tracking branch 'origin/master' into electron/1.7.4	2017-07-18 08:10:08 -07:00
Joao Moreno	b272deba2c	move back to vscode-ripgrep 0.0.12	2017-07-18 14:51:20 +02:00
João Moreno	dbf3c02531	Revert "Make npm install work again with NPM 5"	2017-07-18 12:35:38 +02:00
Rob Lourens	d68fe6be53	Update vscode-ripgrep with temp fix	2017-07-17 13:19:43 -07:00
Daniel Imms	6ef24e1984	Merge remote-tracking branch 'origin/master' into electron/1.7.4	2017-07-17 09:39:21 -07:00
Daniel Imms	dd22800efd	electron@1.7.4	2017-07-16 12:18:40 -07:00
Ivan Zlatev	bce2d5d371	Update yauzl to a newer version to fix electron mksnapshot extract errors. Possibly due to a dependency chain mismatch pulling in an incompatible extract-zip version.	2017-07-15 11:48:38 +01:00
kieferrm	6572aacf64	update distro reference	2017-07-13 07:41:49 -07:00
Benjamin Pasero	56a5bf1724	fix distro commit	2017-07-13 08:11:35 +02:00
kieferrm	4f0f02e575	update distro reference	2017-07-12 14:55:12 -07:00
Matt Bierner	5da27baff3	Build VSCode using TS 2.4 (#30473) ... * Build VSCode using TS 2.4.1 Fixes #28643 a * Reformat a few files for 2.4 * Fix compile errors in jsoneditingservice	2017-07-12 11:28:47 -07:00
Benjamin Pasero	de4b5be4c6	Move our watermark to resources so that distro can pick it up (#30256) ... * move watermark to resources folder * add to build * 💄 * update distro * update distro	2017-07-12 08:57:37 +02:00
Daniel Imms	91e625f7df	node-pty@0.6.9	2017-07-09 17:08:13 -07:00
Daniel Imms	5e7786f1b5	nsfw@1.0.16 ... Fixes #30126	2017-07-07 14:28:16 -07:00
Daniel Imms	b32d2d4490	Uplevel xterm.js ... Brings in a bunch of changes from xterm.js@2.8.0 as well as some extra fixes. Fixes #30260 (for v1.15) Fixes #29723	2017-07-07 11:32:46 -07:00
Benjamin Pasero	33e251c67b	bump to 1.15.0	2017-07-03 10:18:39 +02:00
Rob Lourens	bf303b9aa3	Update "distro" key	2017-06-30 15:52:13 -07:00
kieferrm	ff6b72fb0e	updating distro	2017-06-28 14:55:38 -07:00
Andre Weinand	1888ad8b5e	use final DAP 1.21.0	2017-06-28 11:40:57 +02:00
kieferrm	699d92d718	update distro reference	2017-06-25 17:09:56 -07:00