25396 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Max Brunsfeld	bde62eba6a	Merge branch 'beta'	2015-09-25 13:28:23 -07:00
Max Brunsfeld	ad60d7bec2	⬆️ grunt-electron-installer	2015-09-25 13:28:09 -07:00
Max Brunsfeld	cee5d2fbb9	⬆️ text-buffer	2015-09-25 13:22:12 -07:00
Max Brunsfeld	ee8f436490	Merge branch 'beta'	2015-09-25 13:20:35 -07:00
Max Brunsfeld	46ed413241	Merge branch 'stable' into beta	2015-09-25 13:20:01 -07:00
Max Brunsfeld	7229d1a429	Prepare 1.0.20	2015-09-25 13:19:43 -07:00
Max Brunsfeld	5f4f6d2d17	⬆️ text-buffer	2015-09-25 11:19:53 -07:00
Antonio Scandurra	705e8a8dd1	Merge pull request #8926 from atom/as-travis-node-4 ... Add Node 4 to Travis Build Matrix	2015-09-25 19:21:36 +02:00
Antonio Scandurra	92cae0f23a	Test only that the new node version builds on Linux	2015-09-25 11:49:28 +02:00
Antonio Scandurra	929335c1be	wip	2015-09-25 11:47:58 +02:00
Antonio Scandurra	a4804c8f67	wip	2015-09-25 11:45:19 +02:00
Antonio Scandurra	68b38d39f3	Yet another attempt to configure Travis...	2015-09-25 11:42:58 +02:00
Antonio Scandurra	6d835d19ad	Use only node 4 and ⬆️ runas	2015-09-25 11:27:49 +02:00
Antonio Scandurra	85430bc287	Use proper Travis syntax	2015-09-25 11:27:49 +02:00
Antonio Scandurra	80ad759b67	Add the new node in the build matrix	2015-09-25 11:27:49 +02:00
Gabriel	963ea458ee	Fix runas requirement ... runas 2 doesn't build with a recent node.js Closes issue #8922.	2015-09-25 11:27:49 +02:00
Wliu	6196f83804	⬆️ language-javascript@0.96.0	2015-09-24 20:50:17 -04:00
Max Brunsfeld	e8f5094e32	Look for normalized nupkg version when publishing assets	2015-09-24 17:14:24 -07:00
Max Brunsfeld	5a528ffa4e	⬆️ grunt-electron-installer (pre-release)	2015-09-24 17:14:04 -07:00
Max Brunsfeld	27c505d045	⬆️ grunt-electron-installer (pre-release)	2015-09-24 16:37:03 -07:00
Max Brunsfeld	bcd5e0f3be	⬆️ grunt-electron-installer (pre-release)	2015-09-24 16:00:43 -07:00
Max Brunsfeld	bf4999cb0e	Merge branch 'beta' ... Conflicts: package.json	2015-09-24 14:39:48 -07:00
Max Brunsfeld	0ad9701ef5	Merge branch 'stable' into beta	2015-09-24 14:38:47 -07:00
Max Brunsfeld	c444923935	Prepare 1.0.19	2015-09-24 14:38:14 -07:00
Ben Ogle	4e98d2d218	⬆️ fuzzy-finder to add alternate scoring option	2015-09-24 14:14:55 -07:00
Ben Ogle	6a9fe0b428	⬆️ language-html	2015-09-24 14:14:27 -07:00
Max Brunsfeld	911be22b8b	Merge pull request #8933 from atom/mb-fix-text-buffer-load-serialization ... Upgrade text-buffer to fix serialization incompatibility	2015-09-24 14:09:25 -07:00
Max Brunsfeld	9a8989d707	⬆️ text-buffer	2015-09-24 13:46:29 -07:00
Max Brunsfeld	e6e4ec285a	Merge branch 'beta'	2015-09-24 12:16:25 -07:00
Max Brunsfeld	cd527b8cff	Merge branch 'stable' into beta	2015-09-24 12:16:05 -07:00
Max Brunsfeld	235d6f7ff8	Prepare 1.0.18	2015-09-24 12:15:25 -07:00
Max Brunsfeld	c3d75bea92	Prepare 1.0.17	2015-09-24 11:37:40 -07:00
Max Brunsfeld	7a0fa8ecdc	Merge pull request #8897 from ssorallen/lowercase-optional ... Use lowercase 'optional' keyword used by docs	2015-09-24 11:26:07 -07:00
Kevin Sawicki	238f5a9622	Clean root electron directory	2015-09-24 10:30:10 -07:00
Kevin Sawicki	acc9b463df	Merge branch 'beta'	2015-09-24 09:11:00 -07:00
Kevin Sawicki	d29ff7556c	Merge branch 'stable' into beta	2015-09-24 09:05:46 -07:00
Kevin Sawicki	c2b7924830	Merge pull request #8927 from atom/ks-electron-upgrade ... Upgrade to Electron 0.30.7	2015-09-24 08:57:32 -07:00
Kevin Sawicki	b06e5a7bcb	⬆️ electron@0.30.7	2015-09-24 08:07:19 -07:00
Ivan Žužak	f20c73aa9b	⬆️ settings-view@0.222.0	2015-09-24 15:06:36 +02:00
Antonio Scandurra	a137e50857	Merge pull request #8895 from atom/as-undefined-offset-height ... Allow null TextEditorComponent::domNode during visibility check	2015-09-24 10:33:44 +02:00
simurai	9daefc7395	⬆️ one-dark/light-syntax@v1.1.1	2015-09-24 16:11:14 +09:00
Cheng Zhao	c148df11c9	Merge pull request #8900 from atom/cz-update-native-modules ... Update all native modules and their dependents to Nan 2	2015-09-24 13:45:44 +08:00
Max Brunsfeld	a97029c3d2	Merge pull request #8721 from scv119/autoupdate ... Add --no-auto-update while run `scripts/build` to disable autoupdate	2015-09-23 17:31:52 -07:00
Nathan Sobo	af83249d4e	Merge branch 'stable' into beta	2015-09-23 16:59:50 -06:00
Max Brunsfeld	2a1c9f0cf3	Merge branch 'master' into cz-update-native-modules ... Conflicts: package.json	2015-09-23 12:48:12 -07:00
Max Brunsfeld	bb2bd5492f	Merge branch 'master' into cz-update-native-modules ... Conflicts: package.json	2015-09-23 12:46:08 -07:00
Nathan Sobo	de2bce4f1d	More helpful hints	2015-09-23 13:07:31 -06:00
Antonio Scandurra	4ffeb68403	Ensure domNode is not set arbitrarily to null	2015-09-23 19:01:57 +02:00
Nathan Sobo	0a67cb9729	Merge pull request #8682 from atom/tj-remove-deprecations ... Remove deprecated code	2015-09-23 10:41:26 -06:00
Nathan Sobo	50ce1c4afc	Guard against undefined state in Workspace.deserialize	2015-09-23 10:16:59 -06:00