joshaber
1d18ccc2f1
Merge branch 'master' into dh-async-repo
2016-01-12 10:20:00 -05:00
joshaber
bd8b26ab46
Don't use require.resolve.
2016-01-12 10:19:55 -05:00
joshaber
a7d46e4435
Capture less in .checkoutHeadForEditor.
2016-01-11 21:36:33 -05:00
joshaber
c22a68435a
Make sure the editor disappears quickly.
2016-01-11 21:36:23 -05:00
Max Brunsfeld
389d3d6760
⬆️ spell-check
2016-01-11 15:49:13 -08:00
Max Brunsfeld
eaab862e64
⬆️ spell-check
2016-01-11 15:39:53 -08:00
Max Brunsfeld
945fcf20ec
Merge pull request #10379 from atom/mb-ns-guard-against-decorating-destroyed-markers
...
Explicitly guard against decorating destroyed markers
2016-01-11 14:41:32 -08: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
Wliu
ced74029f8
⬆️ language-ruby@0.67.1
2016-01-11 16:25:57 -05:00
Max Brunsfeld
4ee6b3a492
Merge pull request #10349 from Tyriar/fix_f_keymaps
...
Fix F11 keymaps
2016-01-11 12:59:43 -08:00
joshaber
2f2a0763a2
Log refresh failures.
2016-01-11 15:19:02 -05:00
joshaber
b661d41b2d
Use the promise from refreshStatus to know when we're done.
2016-01-11 15:16:54 -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
27de156f0c
Merge branch 'master' into dh-async-repo
2016-01-11 15:12:07 -05:00
Josh Abernathy
c02d7995ce
Merge pull request #10341 from atom/mq-mac-menu-order
...
Use OS X Human Interface Guidelines compliant menu order
2016-01-11 14:24:16 -05:00
joshaber
07be6d5c6e
Merge branch 'master' into dh-async-repo
2016-01-11 14:14:19 -05:00
Nathan Sobo
2acb9c1ee8
⬆️ settings-view
2016-01-11 11:31:38 -07:00
Nathan Sobo
339489997b
⬆️ tree-view
2016-01-11 11:31:31 -07:00
Nathan Sobo
ff0a62833f
Pin jQuery to 2.1.4
2016-01-11 11:26:31 -07:00
Nathan Sobo
f44a26fa56
Merge pull request #10375 from atom/fire-changelog
...
🔥 CHANGELOG.md
2016-01-11 10:25:14 -07:00
Josh Abernathy
9e6136470e
🔥 CHANGELOG.md
...
Having this file still here is confusing. Do we use it, or do we use https://github.com/benogle/pr-changelog ?
Let's apply 🔥 if we're not gonna keep it up to date.
/cc @mnquintana
2016-01-11 12:17:08 -05:00
joshaber
38616e9199
⬆️ node-git@0.7.0
2016-01-11 11:43:21 -05:00
Daniel Hengeveld
d48f3aaed8
⬆️ settings-view@0.232.1
...
refs https://github.com/atom/settings-view/pull/698
2016-01-11 10:06:01 -05:00
Wliu
35f262f411
⬆️ language-html@0.44.0
2016-01-10 20:41:43 -05:00
Machiste Quintana
859d8605a9
Merge branch 'master' into mq-mac-menu-order
2016-01-10 14:49:45 -05: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
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
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
Lee DohM
e9bb1f9220
Sort alphabetically
2016-01-07 19:31:03 -08: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
