Commit Graph

13208 Commits

Author SHA1 Message Date
Daniel Hengeveld
abd41d1208 Add .isSubmodule 2015-10-26 16:35:57 +01:00
Daniel Hengeveld
4a478f7f84 ES6 style fixes 2015-10-26 16:35:48 +01:00
Daniel Hengeveld
e39fe437ec Replace a bunch of Promise.resolve return values with plain values 2015-10-26 15:28:48 +01:00
Daniel Hengeveld
86f6b62176 Correctly determine new/mod/del status as per git-utils 2015-10-26 15:18:37 +01:00
Daniel Hengeveld
03045674b8 Export nodegit from GitRepositoryAsync 2015-10-26 15:18:11 +01:00
Daniel Hengeveld
1d2834f2ad .isProjectAtRoot 2015-10-23 12:42:16 +02:00
Daniel Hengeveld
22ff8c5a9e don't return a promise here 2015-10-23 12:42:00 +02:00
Daniel Hengeveld
02d8ead883 Checkout head asyncly
This is the first tentative step in actually using the nodegit wrapper.
2015-10-22 15:49:21 +02:00
Daniel Hengeveld
c2520f4909 Remove confirmation from git-repo-async to match git-repo
cf
https://github.com/atom/atom/commit/f9a269ed995c4151678aef787573fe44657e
d6dd
2015-10-22 15:42:42 +02:00
Daniel Hengeveld
7b87764992 this breaks under the new test env setup 2015-10-21 17:09:32 +02:00
Daniel Hengeveld
226c1dd6a7 Merge remote-tracking branch 'remotes/origin/master' into dh-async-repo 2015-10-21 14:52:36 +02:00
Nathan Sobo
33839d1f0e Pass current options to loadState 2015-10-20 19:52:42 -06:00
Daniel Hengeveld
bea002bddb Incomplete implementation of checkoutHeadForEditor 2015-10-20 18:02:47 +02:00
Daniel Hengeveld
4c0c732766 Get path status after checkout 2015-10-20 17:03:08 +02:00
Daniel Hengeveld
196fb35b65 Add missing return in checkouthead 2015-10-20 16:52:43 +02:00
Daniel Hengeveld
716a96f814 Errant logs 2015-10-20 16:02:34 +02:00
Daniel Hengeveld
2ff283a6b0 Async buffer events 2015-10-20 16:01:35 +02:00
Daniel Hengeveld
60180677a2 add .async attribute to GitRepository 2015-10-20 14:03:19 +02:00
Antonio Scandurra
5fc521fedc Add deprecated method to TextEditor 2015-10-20 08:37:15 +02:00
Antonio Scandurra
40e3b08a8c Add TextEditorElement::getMaxScrollTop 2015-10-20 08:36:27 +02:00
Wliu
1593cdbf7a 🐛 Fix toggle-menu-bar command 2015-10-19 18:19:43 -04:00
Daniel Hengeveld
0e6d30e707 .refreshStatus() (partial implementation) 2015-10-19 17:04:27 +02:00
Daniel Hengeveld
2c96f8ce3d .getDirectoryStatus 2015-10-19 16:10:13 +02:00
Daniel Hengeveld
ab4ba2ca4c .getPathStatus() 2015-10-19 15:15:42 +02:00
Nathan Sobo
979b08f5fe Override console.log/error/warn in headless mode to log to stdout/stderr 2015-10-17 10:55:23 -06:00
Nathan Sobo
c35411cd29 🎨 2015-10-17 10:52:39 -06:00
Nathan Sobo
abee4c1db4 Default devMode to true ASAP if running Atom in test mode
Previously, we ran the window in devMode, but didn’t set devMode to true
early enough to compute the correct resource path. This caused errors
when attempting to load the bundled keymaps when running atom —test
without the —dev flag.
2015-10-17 10:39:26 -06:00
Thomas Johansen
2cb77aa4b9 🐛 Use fat arrow to capture correct scope
Fixes #9187
2015-10-17 16:55:57 +02:00
Thomas Johansen
306729f20c 🐛 Use fat arrow to capture correct scope
Fixes #9186
2015-10-17 16:55:04 +02:00
Wliu
6495f1a531 Revert "🔥 subpixel-font-scaling"
This reverts commit 1c0420b3bb.
2015-10-16 19:58:47 -04:00
Wliu
1c0420b3bb 🔥 subpixel-font-scaling
This option was removed in Electron v0.33.9
2015-10-16 19:57:40 -04:00
Max Brunsfeld
f31328baec Disable linter warning for Error prototype method 2015-10-16 16:25:45 -07:00
Max Brunsfeld
c36b4bd169 Make Error.prepareStackTrace read-only (again)
This time, we've provided a way for Grim to access an Error's
raw stack trace array
2015-10-16 16:25:45 -07:00
Max Brunsfeld
7d74382782 Fix extra child node removal in PanelContainerElement 2015-10-16 16:18:40 -07:00
Nathan Sobo
26a5b26cb9 Merge pull request #8779 from atom/cz-electron-32
Update to Electron v0.33.x
2015-10-16 15:59:14 -06:00
Max Brunsfeld
cd9e24ea33 Don't prevent renderer-side reloads 2015-10-16 12:04:35 -07:00
Daniel Hengeveld
df949d3a3d more ::checkoutHead specs 2015-10-16 19:24:34 +02:00
Daniel Hengeveld
dfb24ce617 Clean up init a bit 2015-10-16 19:12:08 +02:00
Nathan Sobo
badba2810e Add disablePinchToZoom to ApplicationDelegate 2015-10-16 11:08:52 -06:00
Nathan Sobo
5f2b5a16df Use WebContents.prototype.isLoading instead of defunct .loaded
Fixes cmd-o interaction.
2015-10-16 11:08:51 -06:00
Cheng Zhao
a5c9fcec2c Disable pinch-to-zoom, fixes #8850 2015-10-16 11:08:51 -06:00
Cheng Zhao
70fc6dd524 registerProtocol has been deprecated 2015-10-16 11:08:51 -06:00
Daniel Hengeveld
3b15f4b259 Conform to standardjs style 2015-10-16 18:50:43 +02:00
Daniel Hengeveld
ca4ac209d6 Spike checkoutHead 2015-10-16 18:49:14 +02:00
Antonio Scandurra
05c6c9f9be Soft wrap only when we know lineMaxWidth 2015-10-16 11:14:20 +02:00
Antonio Scandurra
e843c2f058 🐎 Fetch scopes only if required 2015-10-16 11:03:15 +02:00
Antonio Scandurra
3f53a72620 🐎 Cache text in TokenIterator 2015-10-16 10:48:55 +02:00
Antonio Scandurra
b03aa4bf40 Merge branch 'master' into as-cjk-soft-wrap
# Conflicts:
#	spec/display-buffer-spec.coffee
2015-10-16 10:23:44 +02:00
Max Brunsfeld
27526f492c Fix fall-back to dev resource path in main 2015-10-15 18:01:20 -07:00
Max Brunsfeld
93fe0208a5 Make atom.setSize() synchronous again, for now
This method is public, and a spec for TextEditorComponent dependend on it
staying synchronous
2015-10-15 15:12:57 -07:00