Commit Graph

27425 Commits

Author SHA1 Message Date
Katrina Uychaco
364205ca56 Ensure terminate handler is invoked only once 2016-01-09 18:10:28 -08:00
Katrina Uychaco
d0be1965f2 🎨 2016-01-09 17:26:44 -08:00
Katrina Uychaco
2d00163e18 Refactor pending item tests 2016-01-09 17:19:32 -08:00
Katrina Uychaco
43d933eca8 Change order of tests 2016-01-09 17:18:07 -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
Daniel Imms
235e489f6e Fix F11 keymaps
Function key keymaps don't work when they feature upperface 'F' characters.
They still tend to work because they typically have an application menu item
which is associated with it and falled back upon. The main difference is that
the originalEvent (KeyboardEvent) is not retained when doing this fallback as
Atom thinks that the menu item was pressed instead of the keymap.

Fixes #10287
2016-01-09 04:20:34 -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
Katrina Uychaco
5738b14eda 🎨 2016-01-08 13:39:46 -08:00
Max Brunsfeld
8bbab51959 Merge pull request #10336 from atom/wl-backport-tabs-fix
Backport identical tab names fix
2016-01-08 11:41:10 -08:00
Max Brunsfeld
b8c6fec2f6 Merge pull request #10334 from atom/wl-backport-fullscreen-fix
Backport Electron stability fixes to 1.3
2016-01-08 11:40:26 -08:00
Machiste Quintana
1a13913168 Use OS X Human Interface Guidelines compliant menu order
Fixes https://github.com/atom/atom/issues/10302
2016-01-08 12:00:24 -05:00
Machisté N. Quintana
dd1eb750fe Merge pull request #10332 from atom/ld-reload-window-menu
Relocate and rename 'View > Reload' to prevent confusion
2016-01-08 11:56:01 -05:00
Antonio Scandurra
d00164dc3c Deal with rows instead of points in LineTopIndex 2016-01-08 11:05:55 +01:00
Wliu
0bb8e21c04 ⬆️ language-json@0.17.3 2016-01-07 22:49:51 -05:00
Wliu
f527504402 ⬆️ language-python@0.43.0 2016-01-07 22:49:30 -05:00
Max Brunsfeld
8f1c49cb5c Merge pull request #9636 from DouweM/unique-title
Use unique text editor title in window and tab titles
2016-01-07 22:38:10 -05:00
Lee DohM
e9bb1f9220 Sort alphabetically 2016-01-07 19:31:03 -08:00
Cheng Zhao
ad76d3396b ⬆️ electron@0.34.5
Fix #9584.
2016-01-07 22:00:57 -05:00
Lee DohM
de043956bb Relocate and rename 'View > Reload' to prevent confusion 2016-01-07 18:51:26 -08:00
joshaber
2dd5cb6081 Merge branch 'master' into dh-async-repo 2016-01-07 20:55:28 -05:00
Josh Abernathy
84e78f5a0c Merge pull request #10327 from atom/submodules
Async submodule support
2016-01-07 20:54:50 -05:00
Lee Dohm
09dd5d7dfe Merge pull request #10328 from atom/ld-atom-access-token
Use standard GitHub API token during build to prevent API rate limit errors
2016-01-07 17:37:55 -08:00
Katrina Uychaco
28517563eb Merge pull request #10310 from atom/ku-handle-more-fs-errors
Handle EAGAIN and ETIMEDOUT errors on open/save
2016-01-07 16:49:14 -08:00
simurai
9e8507f2b6 Reorder one-light-ui
so it's after one-dark-ui. Handy since they get updated together.
2016-01-08 09:24:08 +09:00
simurai
26a2fe0f44 ⬆️ one-dark/light-syntax@v1.1.2 2016-01-08 09:22:02 +09:00
joshaber
755826b2aa ⬆️ babel-eslint@5.0.0-beta6 2016-01-07 17:20:37 -05:00
Lee DohM
ee564845d6 Default to using standard GitHub API token during build 2016-01-07 14:19:27 -08:00
joshaber
6948dd4e8d Linter was mad about these now. 2016-01-07 17:13:56 -05:00
joshaber
cfb44c34e3 ⬆️ grunt-standard@2.0.0
So that it knows about async functions.
2016-01-07 17:13:14 -05:00
joshaber
11e72d0580 Just Use Or 2016-01-07 17:12:57 -05:00
joshaber
92839a1f4f Test .isSubmodule. 2016-01-07 16:48:28 -05:00
joshaber
d2d5966ee1 More tests for the submodule cases. 2016-01-07 16:37:05 -05:00
joshaber
565f28dfc4 Update . getCachedUpstreamAheadBehindCount()
Take submodules into account.
2016-01-07 16:36:55 -05:00
joshaber
a79a528fd1 Make .getRepo() submodule-aware. 2016-01-07 16:13:46 -05:00
joshaber
957c8557cc Use Grown Up repositories for submodules. 2016-01-07 15:29:01 -05:00
Max Brunsfeld
ec66a66bb3 Merge pull request #9990 from scv119/test
Add a core config `core.automaticallyUpdate` to disable Atom autoupdate.
2016-01-07 11:05:43 -08:00
joshaber
dcb9371c13 Test it. 2016-01-07 13:07:36 -05:00
joshaber
0bef58a8a4 Added a fixture that has submodules. 2016-01-07 13:05:36 -05:00
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
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