github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-24 14:28:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
25,480 Commits 140 Branches 571 Tags
daca18f2e533af66ebe3bd90db2d4e0a541c8bfe
Commit Graph

25480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wliu
daca18f2e5 ⬆️ language-ruby@0.60.0 2015-09-27 21:35:10 -04:00
Wliu
5f2a5051af Merge pull request #8958 from atom/wl-remove-hardcoded-makefile 
Remove hardcoded Makefile tab behavior
 2015-09-27 09:58:25 -04:00
Wliu
7c0a656036 🔥 Remove hardcoded Makefile tab behavior 2015-09-26 15:54:51 -04:00
Wliu
70440efc06 ⬆️ language-make@0.18.0 2015-09-26 15:43:29 -04:00
Wliu
e9a8646b0d ⬆️ language-ruby-on-rails@0.23.0 2015-09-26 14:18:20 -04:00
Wliu
0451dbac81 ⬆️ language-coffee-script@0.42.0 2015-09-26 14:12:38 -04:00
Antonio Scandurra
f17767a2bc Merge pull request #8905 from atom/as-display-buffer-logical-coordinates 
Use logical coordinates in DisplayBuffer
 2015-09-26 18:05:10 +02:00
Antonio Scandurra
a870252702 🔥 Remove unused code 2015-09-26 18:04:15 +02:00
Thomas Johansen
82805d204e 🐛 Fix invalid shellAppDir on OS X 
This resolves the "perfect storm" scenario that resulted when #8829
got merged with `master`. The merge resulted in an invalid shellAppDir
being used, which in turn propagated all the way into script/set-version
and thus the plist update commands failed since it was pointed at a path
which did not exist.

TL;DR: the .app suffix was missing from shellAppDir due to code reordering.

/cc @maxbrunsfeld
 2015-09-26 13:20:48 +02:00
Max Brunsfeld
4bca7ff07c Merge branch 'beta' 2015-09-25 15:32:22 -07:00
Max Brunsfeld
74f6159c05 Merge branch 'master' into beta 2015-09-25 15:31:29 -07:00
Max Brunsfeld
8c7947ed52 Merge pull request #8829 from atom/mb-adjust-app-name-by-channel 
Adjust app name based on channel, so that beta and stable can both be installed
 2015-09-25 15:30:00 -07:00
Max Brunsfeld
ff8203460a Merge branch 'master' into mb-adjust-app-name-by-channel 
Conflicts:
	build/Gruntfile.coffee
 2015-09-25 14:47:58 -07:00
Max Brunsfeld
414ef713da Merge branch 'beta' 2015-09-25 14:42:23 -07:00
Max Brunsfeld
866b50f0d7 Prepare 1.1.0-beta.1 2015-09-25 14:39:20 -07:00
Max Brunsfeld
0e7abe4b8f Merge branch 'beta' 2015-09-25 14:22:25 -07:00
Max Brunsfeld
0237c17bf9 Prepare 1.1.0-beta.1 2015-09-25 14:21:12 -07:00
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 v1.0.19 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
74deceb037 🎨 2015-09-25 18:03:07 +02:00
Antonio Scandurra
7316eb4d52 🔥 Drop deprecated methods from the public API 2015-09-25 17:27:14 +02:00
Antonio Scandurra
7cd318f55a 🔥 2015-09-25 13:28:18 +02:00
Antonio Scandurra
a96af2465f 🎨 Use ::setWidth and ::setHeight 2015-09-25 13:26:30 +02:00
Antonio Scandurra
a0277728d6 🔥 Remove deprecated methods 2015-09-25 12:58:23 +02:00
Antonio Scandurra
bded7e4fb0 💚 2015-09-25 12:04:25 +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
Antonio Scandurra
051baebd9c Shim ::setHeight and ::getHeight to TextEditorElement 2015-09-25 11:15:41 +02:00
Antonio Scandurra
33a67ad3c9 Shim ::setWidth and ::getWidth to TextEditorElement 2015-09-25 11:05:41 +02:00
Antonio Scandurra
ce714b9852 🎨 Rename to ::onDidRequestAutoscroll 2015-09-25 10:57:09 +02:00
Antonio Scandurra
b0d70a63c6 Prevent default event for actions that won't lead to scrolling 2015-09-25 10:55:03 +02:00
Antonio Scandurra
0e72593a0c Enforce a 'last scroll wins' model for batched scrolls 2015-09-25 10:43:20 +02:00
Antonio Scandurra
d65b5d1793 Revert "Maintain scroll history" 
This reverts commit 2e6bb53303.
 2015-09-25 10:31:48 +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