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
27,372 Commits 140 Branches 571 Tags
e5aebcb351cd9f6b1665b5bbeb453a3cc8642e4e
Commit Graph

27372 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
joshaber
e5aebcb351 Revert "Wait a tick before checking for path subscriptions?" 
This reverts commit d9cf7a73c6.
 2016-01-15 17:36:22 -05:00
joshaber
d9cf7a73c6 Wait a tick before checking for path subscriptions? 2016-01-15 17:02:18 -05:00
joshaber
0332c8aab3 Enable thread safety. 2016-01-15 16:33:20 -05:00
joshaber
80a8f83f04 ⬆️ nodegit@0.8 2016-01-15 16:32:02 -05:00
Josh Abernathy
4d740d3346 Merge pull request #9213 from atom/dh-async-repo 
Async Git Repository class
 2016-01-15 16:17:41 -05:00
Katrina Uychaco
f173199b91 Merge pull request #10409 from atom/ku-pending-editor 
Further improvements to pending item functionality
 2016-01-15 13:07:46 -08:00
joshaber
afc32d5905 ⬆️ tree-view@0.200 2016-01-15 14:44:06 -05:00
joshaber
7cfb8a3207 Merge branch 'master' into dh-async-repo 2016-01-15 13:39:03 -05:00
Josh Abernathy
7d9ed01b8c Merge pull request #10352 from atom/dh-async-repo-relativize-symlinks 
Support symlinked repo roots when relativizing
 2016-01-15 13:37:03 -05:00
joshaber
fb5b3f0473 🔥 some lint. 2016-01-15 13:19:28 -05:00
joshaber
f30f2c0d62 Try using .getStatusExt instead of .getStatus. 2016-01-15 12:29:00 -05:00
Daniel Hengeveld
281d6a66b9 Don't let label be null 2016-01-14 21:17:29 -05:00
Katrina Uychaco
8677ca3a10 ⬆️ tree-view 2016-01-14 18:08:06 -08:00
Katrina Uychaco
53480aff14 ⬆️ find-and-replace 2016-01-14 18:03:40 -08:00
Daniel Hengeveld
4fff6221bd Add option for custom label to waitsForPromise 2016-01-14 20:47:02 -05:00
Katrina Uychaco
4c1ebdf1b9 Merge branch 'master' into ku-pending-editor 2016-01-14 17:40:41 -08:00
Katrina Uychaco
44a648a9ea Destroy any existing pending pane item when adding a pending item 2016-01-14 17:21:48 -08:00
Lee Dohm
da14788e73 ⬆️ bookmarks@0.38.2 2016-01-14 14:26:02 -08:00
Antonio Scandurra
8c78c4f26b Merge pull request #9930 from atom/as-block-decorations 
Block Decorations
 2016-01-14 13:20:00 -07:00
Daniel Hengeveld
411a80dab6 Merge remote-tracking branch 'remotes/origin/dh-async-repo' into dh-async-repo-relativize-symlinks 2016-01-14 14:55:16 -05:00
Antonio Scandurra
a812f282a2 Measure decorations only for visible editors 2016-01-14 12:36:23 -07:00
Lee Dohm
013f80f2f5 Merge pull request #10256 from leo/master 
Remove "Open Your" from menu items
 2016-01-14 11:17:29 -08:00
joshaber
74d94ae12c Merge branch 'master' into dh-async-repo 2016-01-14 13:53:28 -05:00
Wliu
b46c72a8c5 ⬆️ language-git@0.12.1 
Fixes specs
 2016-01-14 12:15:22 -05:00
joshaber
d6cd29241a Merge branch 'master' into dh-async-repo 2016-01-14 11:39:56 -05:00
joshaber
f3a6f2ed1e Merge branch 'master' into dh-async-repo 2016-01-14 11:39:42 -05:00
Josh Abernathy
9506f94c3d Merge pull request #10415 from atom/wl-cascade-fixes 
Don't cascade maximized windows
 2016-01-14 11:37:43 -05:00
joshaber
4f6ff440e4 ⬆️ language-git@0.12.0 2016-01-14 11:31:54 -05:00
Antonio Scandurra
f81843d465 Merge branch 'master' into as-block-decorations 2016-01-14 09:30:06 -07:00
Wliu
8c767a82d6 Remove OS X conditional logic 2016-01-14 11:01:59 -05:00
Wliu
39e9075e01 Don't cascade maximized windows 
Fixes #10335
 2016-01-14 14:31:09 +00:00
Katrina Uychaco
4fce3668b6 Update specs for pending item behavior 2016-01-13 21:40:32 -08:00
Katrina Uychaco
f3f29c876f Use __dirname in path.resolve for specs 2016-01-13 19:05:38 -08:00
Katrina Uychaco
24b2f5e0cc Keep pending pane upon losing focus 2016-01-13 18:53:10 -08:00
Kevin Sawicki
de44221087 ⬆️ language-gfm@0.83 2016-01-13 17:56:46 -08:00
Daniel Hengeveld
2ad8f0edf8 Add a few failure messages to waitsFors in flaky specs 2016-01-13 16:39:54 -05:00
joshaber
6b48c9d8ec 1.6.0-dev 2016-01-13 16:29:24 -05:00
joshaber
6d61cc560e Merge branch 'beta' 2016-01-13 15:33:03 -05:00
joshaber
d229fed7e7 Merge pull request #10377 from atom/remove-release-notes 
Remove release-notes
 2016-01-13 15:11:55 -05:00
Josh Abernathy
3ed8f0165c Merge pull request #10377 from atom/remove-release-notes 
Remove release-notes
 2016-01-13 15:05:26 -05:00
Max Brunsfeld
18f2f28ad4 Merge branch 'beta' 
Conflicts:
	package.json
 2016-01-13 10:35:47 -08:00
Max Brunsfeld
2c4df2d69b Merge branch 'stable' into beta 
Conflicts:
	package.json
	spec/workspace-spec.coffee
 2016-01-13 10:30:58 -08:00
joshaber
beb1456f69 ⬆️ about@1.3.0 2016-01-13 13:30:03 -05:00
Max Brunsfeld
57aa70cc87 Merge pull request #10395 from atom/mb-disable-babel-logging 
Stop babel from logging to stderr during compilation
 2016-01-13 09:40:45 -08:00
Antonio Scandurra
e6a1763f8c 💚 Give specs a final touch ✨ 2016-01-13 09:45:14 -07:00
Antonio Scandurra
2af5d395dd 📝 Include info for preceding/following block decorations 2016-01-13 09:38:28 -07:00
Antonio Scandurra
904a8fae8f ⬆️ line-top-index 2016-01-13 09:33:14 -07:00
Antonio Scandurra
d370164624 Slightly improve algorithm to calculate @endRow 2016-01-13 09:31:17 -07:00
Antonio Scandurra
1f0e6a0902 Don't calculate height for following decorations at beginning of tiles 2016-01-13 09:21:31 -07:00
Josh Abernathy
68fb9ab2cf Merge pull request #10361 from atom/mq-disable-package 
Only disable a package if it isn't already disabled
 2016-01-13 09:49:12 -05:00