github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-13 08:04:56 -05:00
Code Issues Packages Projects Releases Wiki Activity
27,186 Commits 140 Branches 571 Tags
b661d41b2d1f621694a168c4da98f0c398619e07
Commit Graph

27186 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
7fbc24c0f2 Merge pull request #10139 from sparanoid/patch-1 
Prevent committing `blob-store`
 2016-01-06 11:10:46 +01:00