github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-06 03:02:13 -04:00
Code Issues Packages Projects Releases Wiki Activity
26,623 Commits 140 Branches 571 Tags
fcb8a13f4a934de1c58eb9fe6338971f4e7f1442
Commit Graph

13442 Commits

Author SHA1 Message Date
Kevin Sawicki
02fe2cf618 🎨 2015-10-27 11:45:35 -06:00
Daniel Imms
5e1c2632e6 📝 Fix Cursor.getScreenPosition comment return type 2015-10-25 18:28:56 -07:00
Nathan Sobo
d2fdc414e7 Merge pull request #8919 from bencolon/workspace_vertical_splits 
Add top/bottom split options when opening uri in a workspace
 2015-10-22 14:13:42 -06:00
Ben Colon
1b0d72b232 Add up/down split options when opening uri in a workspace 2015-10-22 17:03:10 +02:00
Dave Rael
b1d10ef4dc Revert moving parse of command line 
to the first line of start function because the move is not necessary
without having the code for using a command line parameter to set Atom to
portable mode.  This belongs on that branch and in that pull request.
 2015-10-22 09:01:56 -06:00
Dave Rael
8acb2af055 Remove unused parameter 
to keep the code clean and readable
 2015-10-22 08:58:39 -06:00
Dave Rael
35345893fc Fix function name to be consistent with convention 2015-10-22 08:49:08 -06:00
Nathan Sobo
bd199545c0 In PaneContainer.prototype.saveAll, only save modified items 2015-10-21 20:22:20 -06:00
Ben Ogle
f679c4319c Merge branch 'beta' 2015-10-21 17:03:31 -07:00
Max Brunsfeld
3ba9fafbc5 Merge pull request #9218 from atom/mb-fix-dev-mode-new-window 
Don't try to reuse existing normal windows as dev mode windows
 2015-10-21 13:46:15 -07:00
Max Brunsfeld
8a6915e7a6 Pass application delegate to PaneElement 2015-10-21 10:57:56 -07:00
Dave Rael
810f0e4583 Fix merge problem and missing function call 
Merge resulted in a missing require and change to remove unused function
parameters resulted in not calling function
 2015-10-21 09:47:33 -06:00
Dave Rael
e93b013059 Remove unused function parameter 
for setupAtomHome function no longer needing args
 2015-10-21 04:40:05 -06:00
Dave Rael
e0697ecc7f Merge branch 'master' into portable-mode 
Conflicts:
	src/atom-environment.coffee
 2015-10-20 20:58:14 -06:00
Nathan Sobo
33839d1f0e Pass current options to loadState 2015-10-20 19:52:42 -06:00
Dave Rael
8652890958 Simplify markdown escaping for warning 
by using a regular expression instead of multiple replaces
 2015-10-20 10:32:12 -06:00
Dave Rael
6d4105ac97 Escape characters is portable path not writable 
warning to resolve missing backslash and other potential problems
resulting from the markdown-parsed nature of the display of notifications.
 2015-10-20 07:09:58 -06: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
Max Brunsfeld
3535525ad9 Don't try to reuse existing normal windows as dev mode windows 2015-10-19 13:43:40 -07: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
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
Dave Rael
03faddd7ae Undo add command line parameter to set portable 
undo 4312f76ed7 to include this in a pull
request of its own
 2015-10-16 07:02:53 -06: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
Dave Rael
bcfb6ab407 Remove explicit returns 2015-10-15 16:57:12 -06:00
Dave Rael
ef71211b82 Always include portable home path in warning 
when warning that portable home path not writable
 2015-10-15 16:35:35 -06: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
Dave Rael
28a1bbf9a2 Fix function names - consistent with convention 2015-10-15 14:35:04 -06:00
Dave Rael
265ee01c1d Clean convention inconsistencies for portable mode 2015-10-15 14:32:33 -06:00
Nathan Sobo
28ed6f3d9f Restore async window method calls 
Signed-off-by: Max Brunsfeld <maxbrunsfeld@github.com>
 2015-10-15 13:26:30 -06:00
Antonio Scandurra
4766c98bbe Treat Korean characters as different kinds of chars 2015-10-15 21:02:21 +02:00