Wliu
|
71574d785c
|
Merge remote-tracking branch 'master' into wl-electron-35
# Conflicts:
# package.json
# src/application-delegate.coffee
|
2015-11-25 18:44:40 -05:00 |
|
Nathan Sobo
|
8978691831
|
Merge pull request #9773 from atom/mb-ns-prepare-stack-trace-fixes
Allow Error.prepareStackTrace to be temporarily reassigned
|
2015-11-24 11:59:53 -07:00 |
|
Antonio Scandurra
|
c061b27076
|
✅
|
2015-11-24 17:36:44 +01:00 |
|
Antonio Scandurra
|
9376738918
|
Make spec async because of Promise-based API
|
2015-11-24 12:28:31 +01:00 |
|
Max Brunsfeld
|
4bc46db355
|
Still assign error's raw stack when prepareStackTrace is overridden
Signed-off-by: Nathan Sobo <nathan@github.com>
|
2015-11-23 15:30:11 -08:00 |
|
Max Brunsfeld
|
4616b426b0
|
Allow Error.prepareStackTrace to be temporarily reassigned
Fixes https://github.com/atom/atom/issues/9660
Signed-off-by: Nathan Sobo <nathan@github.com>
|
2015-11-23 15:22:15 -08:00 |
|
Max Brunsfeld
|
30b3cb249e
|
Merge pull request #9636 from DouweM/unique-title
Use unique text editor title in window and tab titles
|
2015-11-20 16:55:38 -08:00 |
|
Nathan Sobo
|
3e22d9f7a2
|
Merge PR #9607 with a small change
|
2015-11-20 10:41:22 -07:00 |
|
Nathan Sobo
|
704da43800
|
Prevent spec from closing window
|
2015-11-20 10:34:05 -07:00 |
|
Antonio Scandurra
|
a546005c65
|
Merge pull request #9709 from atom/as-fix-longest-screen-row-issue
Compute content width when the longest row is the first one
|
2015-11-20 09:24:33 -08:00 |
|
Antonio Scandurra
|
93481c8a0d
|
Move ::isTextEditor down into Workspace
|
2015-11-19 17:56:53 -08:00 |
|
Antonio Scandurra
|
85ee586e2e
|
✅ More specs
|
2015-11-19 17:30:33 -08:00 |
|
Wliu
|
577b85e76c
|
Merge remote-tracking branch 'refs/remotes/origin/master' into wl-electron-35
|
2015-11-19 20:20:24 -05:00 |
|
Antonio Scandurra
|
d427091b49
|
✅ Write specs for ::isTextEditor
|
2015-11-19 17:04:18 -08:00 |
|
Antonio Scandurra
|
0218431c62
|
🐛 Compute content width when the longest row is the first one
|
2015-11-19 16:38:20 -08:00 |
|
Antonio Scandurra
|
ff08642d3b
|
Return early in FakeLinesYardstick for unrendered rows
This allows us to have a more consistent behavior with the real LinesYardstick.
|
2015-11-19 16:32:39 -08:00 |
|
Nathan Sobo
|
b04c26ba30
|
Discard highlights that end above the visible row range
Fixes #9628
|
2015-11-18 21:32:05 -08:00 |
|
Wliu
|
5fca7b6582
|
More ipc-renderer fixes
|
2015-11-18 21:20:45 -05:00 |
|
Wliu
|
fec1507ff4
|
Require ipc-renderer where it belongs
|
2015-11-18 21:10:40 -05:00 |
|
Wliu
|
0945383d78
|
Merge remote-tracking branch 'refs/remotes/origin/master' into wl-electron-35
|
2015-11-18 16:11:49 -05:00 |
|
Douwe Maan
|
5c701ed5df
|
Use long title in tests
|
2015-11-18 20:31:42 +01:00 |
|
Wliu
|
6c811433cf
|
Fix executeJavaScriptInDevTools
The joy of Atom and Electron having identically-named functions
|
2015-11-17 23:11:55 -05:00 |
|
Wliu
|
6cd480b37e
|
Fix Electron deprecations
|
2015-11-17 21:16:09 -05:00 |
|
Nathan Sobo
|
9537007a2a
|
Merge branch 'beta'
|
2015-11-17 16:57:33 -08:00 |
|
Nathan Sobo
|
e475065b45
|
Merge branch 'stable' into beta
|
2015-11-17 16:57:19 -08:00 |
|
Nathan Sobo
|
3b2c6afdaf
|
Fix removeListener calls
|
2015-11-17 16:23:38 -08:00 |
|
Douwe Maan
|
a9bf2a73a5
|
Improve TextEditor::getLongTitle
|
2015-11-17 23:34:31 +01:00 |
|
Nathan Sobo
|
8da44c4dfc
|
Discard highlights that end above the visible row range
Fixes #9628
|
2015-11-17 11:45:51 -08:00 |
|
Wliu
|
3a34a95947
|
✅ Update TokenizedBuffer specs
|
2015-11-17 12:47:14 -05:00 |
|
Nathan Sobo
|
6862610e70
|
Merge branch 'beta'
|
2015-11-17 08:53:27 -08:00 |
|
Nathan Sobo
|
192e804c8f
|
Fix specs. Duh.
|
2015-11-17 08:53:13 -08:00 |
|
Douwe Maan
|
f93565708b
|
Close empty active window when Close command is given
|
2015-11-16 17:54:06 +01:00 |
|
Nathan Sobo
|
fa66048d71
|
Guard against focusing a destroyed pane
|
2015-11-12 17:34:48 -07:00 |
|
Nathan Sobo
|
df0671cf5f
|
Merge pull request #9513 from Ingramz/grammar-scores
Prioritize file type matching over first line matching in grammar scoring system
|
2015-11-12 16:12:26 -07:00 |
|
Nathan Sobo
|
67c42282a6
|
Merge pull request #9527 from atom/lierdakil-defer-act-hooks
Lierdakil: Defer Activation Hooks
|
2015-11-12 16:06:41 -07:00 |
|
Antonio Scandurra
|
05550699bd
|
Merge pull request #9524 from atom/as-transact-async
Introduce Config::transactAsync
|
2015-11-12 09:26:26 +01:00 |
|
Max Brunsfeld
|
62f4f32d23
|
Merge pull request #9528 from efatsi/master
Remap pane:show-item-9 to activate last pane item
|
2015-11-11 15:14:08 -08:00 |
|
Antonio Scandurra
|
c6cb37ac88
|
🎨
|
2015-11-11 20:26:23 +01:00 |
|
Antonio Scandurra
|
cc30daa617
|
Make sure showing success dialogs works correctly
|
2015-11-11 12:05:11 -07:00 |
|
Antonio Scandurra
|
780979e122
|
Make sure showing errors works correctly
|
2015-11-11 12:05:03 -07:00 |
|
Nathan Sobo
|
db0149ca65
|
Merge pull request #9529 from atom/as-fix-bad-fat-arrow
Use fat arrow when showing errors in CommandInstaller
|
2015-11-11 12:02:36 -07:00 |
|
Max Brunsfeld
|
eafffd9733
|
Merge pull request #9444 from atom/mb-synchronous-scroll-position
Allow synchronous control of scroll position through TextEditor model
|
2015-11-11 09:58:05 -08:00 |
|
Nathan Sobo
|
ec4c5ddb68
|
Merge pull request #9477 from atom/jf-add-appveyor-build
Add Windows CI
|
2015-11-11 10:35:28 -07:00 |
|
Antonio Scandurra
|
0490b1482f
|
Make sure showing success dialogs works correctly
|
2015-11-11 18:19:32 +01:00 |
|
Antonio Scandurra
|
60841e574a
|
Make sure showing errors works correctly
|
2015-11-11 18:18:55 +01:00 |
|
Eli Fatsi
|
84a6f0cb75
|
Remap pane:show-item-9 to activate last pane item
|
2015-11-11 10:09:09 -07:00 |
|
Nikolay Yakimov
|
fe47394b22
|
Update specs for deferred activation hooks
|
2015-11-11 07:51:04 -07:00 |
|
Antonio Scandurra
|
38d713379f
|
🎨 Introduce Config::transactAsync
|
2015-11-11 09:55:20 +01:00 |
|
Max Brunsfeld
|
fefb387d3c
|
Merge branch 'master' into mb-synchronous-scroll-position
Conflicts:
src/text-editor-presenter.coffee
src/text-editor.coffee
|
2015-11-10 16:23:39 -08:00 |
|
Indrek Ardel
|
6520240652
|
Update spec
|
2015-11-11 01:23:07 +02:00 |
|