Commit Graph

13817 Commits

Author SHA1 Message Date
Wliu
7ee74ed4c7 Merge branch 'master' into wl-electron-35 2016-01-15 17:20:31 -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
Daniel Hengeveld
04b4be16aa We don't need to add another param here, actually 2016-01-11 17:43:07 -05:00
Max Brunsfeld
b01e97be59 Explicitly guard against decorating destroyed markers
Signed-off-by: Nathan Sobo <nathan@github.com>
2016-01-11 14:01:55 -08:00
joshaber
2f2a0763a2 Log refresh failures. 2016-01-11 15:19:02 -05:00
joshaber
bf4cb2bc73 🔥 refreshingCount. 2016-01-11 15:16:37 -05:00
joshaber
60afd59edc Serialize refreshing. 2016-01-11 15:16:26 -05:00
joshaber
07be6d5c6e Merge branch 'master' into dh-async-repo 2016-01-11 14:14:19 -05:00
Machiste Quintana
78543a7a34 Only disable a package if it isn't already disabled 2016-01-11 13:44:27 -05:00
Katrina Uychaco
8d3b86acb5 Serialize pending state for editor 2016-01-10 12:53:39 -08:00
Yuya Tanaka
d4c8770176 Add copy project path command to text-editor 2016-01-10 19:35:34 +09:00
Katrina Uychaco
292ef2fe1c Early return from promise if pane is destroyed 2016-01-09 21:00:53 -08:00
Katrina Uychaco
364205ca56 Ensure terminate handler is invoked only once 2016-01-09 18:10:28 -08:00
Daniel Hengeveld
9d4e9cab5b Make linter happy 2016-01-09 12:22:54 -08:00
Daniel Hengeveld
ed64abaede Always relativize to working directory 2016-01-09 12:04:02 -08:00
Daniel Hengeveld
0c839a91fb Keep track of openedPath when relativizing
.. otherwise if the repo root is a symlink, paths won’t relativize to
it and git statuses won’t be updated/shown.
2016-01-09 11:40:09 -08:00
Nathan Sobo
db74f4a8f0 Merge pull request #10178 from atom/ku-pending-editor
Open file in pending state on single click
2016-01-08 14:45:14 -07:00
Wliu
91b2dc5b9c Merge branch 'master' into wl-electron-35 2016-01-08 16:57:04 +00:00
Antonio Scandurra
d00164dc3c Deal with rows instead of points in LineTopIndex 2016-01-08 11:05:55 +01:00
joshaber
2dd5cb6081 Merge branch 'master' into dh-async-repo 2016-01-07 20:55:28 -05:00