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,435 Commits 140 Branches 571 Tags
3ced484718bb7c0a8f96a491abd6dcbbc824b1ca
Commit Graph

13809 Commits

Author SHA1 Message Date
simurai
3ced484718 Add top-bar and bottom-bar elements 2016-02-01 11:34:08 -08:00
Ben Ogle
8acb742c30 Merge pull request #7916 from oggy/descriptive-enums 
Support descriptions for enum values in config.
 2016-01-26 14:45:00 -08:00
Max Brunsfeld
18a1f06022 Merge pull request #10581 from atom/mb-fix-legacy-config-api 
Require package's main module in legacy activateConfig method
 2016-01-25 15:28:50 -08:00
Max Brunsfeld
d055a686ae Merge pull request #10486 from atom/bf-fix-submenu-items 
Honor `created()` function for an item in a submenu.
 2016-01-25 13:31:25 -08:00
Max Brunsfeld
dc903fa124 Require package's main module in legacy activateConfig method 2016-01-25 12:42:12 -08:00
joshaber
191e607bd6 Merge branch 'stable' 2016-01-22 17:01:03 -07:00
Josh Abernathy
91eb2b2a28 Merge pull request #10293 from atom/as-more-flexible-inputs-for-blob-store 
Ignore errors when loading an invalid blob store
 2016-01-22 11:44:29 -07:00
joshaber
60c33f6bc9 Open submodules directly instead of searching. 2016-01-19 16:35:36 -07:00
joshaber
50c74499dc Link to the libgit2 issue. 2016-01-19 16:34:30 -07:00
Michael Bolin
9423ec8b3a Renamed local variables as recommended by @ssorallen. 2016-01-19 12:37:38 -08:00
joshaber
514842ca77 If we can't refresh a submodule, drop it. 2016-01-19 11:59:16 -05:00
Josh Abernathy
ab02a7b5a9 Merge pull request #10445 from atom/update-nodegit 
Update nodegit
 2016-01-19 08:34:35 -05:00
Michael Bolin
3d5386e514 Honor created() function for an item in a submenu. 
Fixes #10483.
 2016-01-18 16:39:19 -08:00
Michael Bolin
04b100fab8 Revert "Honor created() function for an item in a submenu." 
This reverts commit 9917ed39aa.

Sorry, apparently I don't know how to use Git anymore.
I'm just trying to put this up for review and it went straight
to master instead.
 2016-01-18 16:36:49 -08:00
Michael Bolin
9917ed39aa Honor created() function for an item in a submenu. 
Fixes #10483.
 2016-01-18 16:34:36 -08:00
Michael Bolin
f8d20760af Revert "Honor created() function for an item in a submenu." 
This reverts commit 962308509b.
 2016-01-18 16:33:35 -08:00
Michael Bolin
962308509b Honor created() function for an item in a submenu. 
Fixes #10483.
 2016-01-18 16:32:16 -08:00
Lee Dohm
f826d38d0b Merge pull request #10068 from atom/ld-linkify-promise-docs 
📝 Linkify all docs mentions of Promises
 2016-01-18 00:23:52 -08:00
joshaber
0332c8aab3 Enable thread safety. 2016-01-15 16:33:20 -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
joshaber
7cfb8a3207 Merge branch 'master' into dh-async-repo 2016-01-15 13:39:03 -05:00
joshaber
f30f2c0d62 Try using .getStatusExt instead of .getStatus. 2016-01-15 12:29:00 -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
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
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
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
24b2f5e0cc Keep pending pane upon losing focus 2016-01-13 18:53:10 -08: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
2af5d395dd 📝 Include info for preceding/following block decorations 2016-01-13 09:38:28 -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
Max Brunsfeld
aea9c5804a Improve terminate pending state tests. 
Remove argument to remove pending state listeners.
 2016-01-12 18:34:32 -08:00
Max Brunsfeld
680e123f88 Prevent babel from logging to stderr 2016-01-12 15:42:44 -08:00
Daniel Hengeveld
9fe2470a05 Merge remote-tracking branch 'remotes/origin/dh-async-repo' into dh-async-repo-relativize-symlinks 2016-01-12 15:59:32 -05:00
Daniel Hengeveld
a35b2c94d0 be more concise, again 2016-01-12 15:54:28 -05:00
Daniel Hengeveld
a9f9cd5b8f Add specs to cover ::relativizeToWorkingDirectory 
Yay, this uncovered a problem with the implementation.
 2016-01-12 15:32:59 -05:00
Antonio Scandurra
6e5c3e0212 Insert following block decorations into the DOM 2016-01-12 12:51:29 -07:00
Antonio Scandurra
4499fa8d6f Split following and preceding block decorations 
In TextEditorPresenter's state for lines.
 2016-01-12 12:04:12 -07:00
Antonio Scandurra
5c5e108d9b Conform to the new LineTopIndex interface 2016-01-12 11:38:48 -07:00
Antonio Scandurra
63220f7ead Add presenter specs for block decorations *after* a row 2016-01-12 10:54:56 -07:00
Josh Abernathy
38d6ded9c4 Merge pull request #10359 from ypresto/copy-project-path 
Add copy project path command to text-editor
 2016-01-12 11:15:09 -05:00
joshaber
1d18ccc2f1 Merge branch 'master' into dh-async-repo 2016-01-12 10:20:00 -05:00
joshaber
a7d46e4435 Capture less in .checkoutHeadForEditor. 2016-01-11 21:36:33 -05:00