joshaber
a86d3b6d94
Stop logging.
2016-01-07 12:44:56 -05:00
joshaber
75fe311e22
Refresh the status for submodules too.
2016-01-07 12:19:51 -05:00
Leonard Lamprecht
4d7af57db3
Move to top level, add separator and ellipses
2016-01-07 11:51:54 +01:00
Leonard Lamprecht
a88f96e65d
Merge remote-tracking branch 'atom/master'
2016-01-07 11:49:15 +01:00
Katrina Uychaco
41c8792a7d
Handle EAGAIN errors on open
2016-01-06 18:27:18 -08:00
Katrina Uychaco
3bcb062ab0
Add friendly message for ETIMEDOUT
2016-01-06 18:23:25 -08:00
Katrina Uychaco
9efb3328bc
Add helper to map error codes to friendly messages
2016-01-06 18:20:46 -08:00
Dave Rael
91253910ef
🏁 Fix corrupting Windows Paths
...
containing non-Ascii characters
Remove workaround that just didn't update the path at all - now including
the Atom path update and preserving the non-Ascii characters
2016-01-06 12:52:29 -07:00
joshaber
6c4d97d0f2
Merge branch 'master' into dh-async-repo
2016-01-06 13:52:18 -05:00
Josh Abernathy
61475ed77c
Merge pull request #10296 from viatsko/repository-providers-priority
...
This change gives custom repositoryProviders more priority
2016-01-06 13:49:46 -05:00
Antonio Scandurra
8603ceb7e8
Make spec more comprehensive
2016-01-06 11:12:21 +01:00
Antonio Scandurra
7fbc24c0f2
Merge pull request #10139 from sparanoid/patch-1
...
Prevent committing `blob-store`
2016-01-06 11:10:46 +01:00
Tunghsiao Liu
eaab7d4ae9
Merge branch 'master' into patch-1
2016-01-06 11:40:24 +08:00
Max Brunsfeld
972d62f9d2
⬆️ text-buffer
2016-01-05 17:23:32 -08:00
Max Brunsfeld
f4a9ee464d
Merge branch 'beta'
2016-01-05 17:23:03 -08:00
Valerii Iatsko
3b8375d2b4
This change gives custom repositoryProviders more priority - this wil allow us to override base git repository implementation
2016-01-06 00:05:58 +01:00
joshaber
eedac0a951
We'll store them by path instead of by name.
2016-01-05 17:31:34 -05:00
Wliu
d855613340
Merge remote-tracking branch 'refs/remotes/origin/master' into wl-electron-35
2016-01-05 17:25:51 -05:00
joshaber
26cd7c63cc
s/upstreamByPath/upstream
...
We’ll track submodule status separately.
2016-01-05 17:10:01 -05:00
joshaber
51bf940fb3
⬆️ nodegit@0.6.3
2016-01-05 15:51:34 -05:00
joshaber
e060cfe03b
Merge branch 'master' into dh-async-repo
2016-01-05 15:50:43 -05:00
joshaber
5045477b5d
path is never used.
2016-01-05 15:28:48 -05:00
joshaber
757bbae1e2
s//openNodeGitRepository/openRepository.
2016-01-05 15:26:16 -05:00
Josh Abernathy
2c4f5c2b02
Merge pull request #10236 from atom/cascade-windows
...
Cascade new windows on OS X
2016-01-05 15:18:11 -05:00
joshaber
d224efb00d
Just test the x coordinate, I suppose.
2016-01-05 14:40:09 -05:00
joshaber
740e8c660a
Put it with its friends.
2016-01-05 14:08:09 -05:00
joshaber
f64878208f
Really don't need this to be its own command.
2016-01-05 14:07:50 -05:00
Antonio Scandurra
11a15dce37
Ignore errors when loading an invalid blob store
2016-01-05 19:55:53 +01:00
Katrina Uychaco
cee41a2fb0
Remove new line
2016-01-05 10:42:07 -08:00
Katrina Uychaco
67d49955f1
Add tests for pending pane items
2016-01-05 10:38:13 -08:00
joshaber
2a29e7d1f4
Revert "Revert "Integration test for new window offset.""
...
This reverts commit c8c8bc941e
2016-01-05 12:48:34 -05:00
joshaber
b6c3b39dfe
Merge branch 'master' into cascade-windows
2016-01-05 12:48:30 -05:00
joshaber
24db4586e4
Merge branch 'master' into dh-async-repo
2016-01-05 12:44:35 -05:00
Josh Abernathy
96eff38707
Merge pull request #10249 from atom/use-project-relative-status
...
Use .getStatusForPaths.
2016-01-05 12:40:28 -05:00
joshaber
6b4a05495e
Commas are important.
2016-01-05 12:38:10 -05:00
joshaber
b8b2c88a0a
Merge branch 'master' into dh-async-repo
2016-01-05 12:36:34 -05:00
joshaber
c8c8bc941e
Revert "Integration test for new window offset."
...
This reverts commit 4ddadcc135
2016-01-05 12:27:59 -05:00
joshaber
4ddadcc135
Integration test for new window offset.
2016-01-05 12:00:08 -05:00
joshaber
94b77d0998
Separate the offset determination from the dimensions.
2016-01-05 11:59:59 -05:00
Nathan Sobo
2493269f09
Merge pull request #10277 from atom/ns-fix-horizontal-measurement
...
Fix measurement of rows that are present in the model but haven't been rendered yet
2016-01-05 09:43:01 -07:00
Antonio Scandurra
018b12973c
Merge pull request #10126 from atom/as-ci-times
...
Print steps time during Grunt tasks and script/bootstrap
2016-01-05 11:27:38 +01:00
Antonio Scandurra
1376afe17e
🎨
2016-01-05 10:57:32 +01:00
Antonio Scandurra
c7a7f0c6dd
🐛 Ignore setting dimensions for destroyed decorations
2016-01-05 10:56:29 +01:00
Antonio Scandurra
0d28018127
🔥 Remove redundant setup in specs
2016-01-05 10:39:01 +01:00
Antonio Scandurra
4f0218c0a2
📝 Fix mistyped spec description
2016-01-05 10:35:33 +01:00
Machisté N. Quintana
6d949d31e0
Merge pull request #10280 from atom/mq-bump-apm
...
⬆️ apm@1.6.0
2016-01-04 21:17:21 -05:00
Machisté N. Quintana
38e331691b
⬆️ apm@1.6.0
2016-01-04 20:42:23 -05:00
Chen Shen
f774e1ce21
add unittest
2016-01-04 17:41:42 -08:00
Nathan Sobo
6669703677
Force a sync render when measuring if we don’t have a DOM node for a row
2016-01-04 16:40:56 -07:00
Nathan Sobo
9f6fbacddd
Don’t clip screen positions in yardstick
...
By clipping positions only in the TextEditorComponent, we can ensure
that we check for the presence of a rendered line for the clipped row
value.
2016-01-04 16:32:38 -07:00
