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

28423 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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