Commit Graph

27493 Commits

Author SHA1 Message Date
joshaber
e0dbf94d2d 1.4.0 2016-01-13 16:29:22 -05:00
joshaber
6d61cc560e Merge branch 'beta' 2016-01-13 15:33:03 -05:00
joshaber
d229fed7e7 Merge pull request #10377 from atom/remove-release-notes
Remove release-notes
2016-01-13 15:11:55 -05:00
Josh Abernathy
3ed8f0165c Merge pull request #10377 from atom/remove-release-notes
Remove release-notes
2016-01-13 15:05:26 -05:00
Max Brunsfeld
18f2f28ad4 Merge branch 'beta'
Conflicts:
	package.json
2016-01-13 10:35:47 -08:00
Max Brunsfeld
2c4df2d69b Merge branch 'stable' into beta
Conflicts:
	package.json
	spec/workspace-spec.coffee
2016-01-13 10:30:58 -08:00
joshaber
beb1456f69 ⬆️ about@1.3.0 2016-01-13 13:30:03 -05:00
Max Brunsfeld
57aa70cc87 Merge pull request #10395 from atom/mb-disable-babel-logging
Stop babel from logging to stderr during compilation
2016-01-13 09:40:45 -08:00
Antonio Scandurra
e6a1763f8c 💚 Give specs a final touch 2016-01-13 09:45:14 -07:00
Antonio Scandurra
2af5d395dd 📝 Include info for preceding/following block decorations 2016-01-13 09:38:28 -07:00
Antonio Scandurra
904a8fae8f ⬆️ line-top-index 2016-01-13 09:33:14 -07:00
Antonio Scandurra
d370164624 Slightly improve algorithm to calculate @endRow 2016-01-13 09:31:17 -07:00
Antonio Scandurra
1f0e6a0902 Don't calculate height for following decorations at beginning of tiles 2016-01-13 09:21:31 -07:00
Josh Abernathy
68fb9ab2cf Merge pull request #10361 from atom/mq-disable-package
Only disable a package if it isn't already disabled
2016-01-13 09:49:12 -05:00
Max Brunsfeld
aea9c5804a Improve terminate pending state tests.
Remove argument to remove pending state listeners.
2016-01-12 18:34:32 -08:00
Max Brunsfeld
680e123f88 Prevent babel from logging to stderr 2016-01-12 15:42:44 -08:00
Max Brunsfeld
bc69e1624b Don't rely on compile cache in babel compilation specs 2016-01-12 15:41:26 -08:00
Daniel Hengeveld
1cde8f8020 Annotate waitsFor in a couple flaky specs 2016-01-12 17:31:28 -05:00
Daniel Hengeveld
9fe2470a05 Merge remote-tracking branch 'remotes/origin/dh-async-repo' into dh-async-repo-relativize-symlinks 2016-01-12 15:59:32 -05:00
Daniel Hengeveld
a35b2c94d0 be more concise, again 2016-01-12 15:54:28 -05:00
Daniel Hengeveld
a9f9cd5b8f Add specs to cover ::relativizeToWorkingDirectory
Yay, this uncovered a problem with the implementation.
2016-01-12 15:32:59 -05:00
Antonio Scandurra
6e5c3e0212 Insert following block decorations into the DOM 2016-01-12 12:51:29 -07:00
Antonio Scandurra
4499fa8d6f Split following and preceding block decorations
In TextEditorPresenter's state for lines.
2016-01-12 12:04:12 -07:00
Antonio Scandurra
5c5e108d9b Conform to the new LineTopIndex interface 2016-01-12 11:38:48 -07:00
Antonio Scandurra
63220f7ead Add presenter specs for block decorations *after* a row 2016-01-12 10:54:56 -07:00
Josh Abernathy
38d6ded9c4 Merge pull request #10359 from ypresto/copy-project-path
Add copy project path command to text-editor
2016-01-12 11:15:09 -05:00
joshaber
0a57f377f8 Merge branch 'master' into remove-release-notes 2016-01-12 11:13:01 -05:00
joshaber
1d18ccc2f1 Merge branch 'master' into dh-async-repo 2016-01-12 10:20:00 -05:00
joshaber
bd8b26ab46 Don't use require.resolve. 2016-01-12 10:19:55 -05:00
Wliu
53950f6687 ⬆️ language-ruby@0.68.0 2016-01-12 10:14:40 -05:00
joshaber
a7d46e4435 Capture less in .checkoutHeadForEditor. 2016-01-11 21:36:33 -05:00
joshaber
c22a68435a Make sure the editor disappears quickly. 2016-01-11 21:36:23 -05:00
Max Brunsfeld
389d3d6760 ⬆️ spell-check 2016-01-11 15:49:13 -08:00
Max Brunsfeld
eaab862e64 ⬆️ spell-check 2016-01-11 15:39:53 -08:00
Daniel Hengeveld
04b4be16aa We don't need to add another param here, actually 2016-01-11 17:43:07 -05:00
Max Brunsfeld
945fcf20ec Merge pull request #10379 from atom/mb-ns-guard-against-decorating-destroyed-markers
Explicitly guard against decorating destroyed markers
2016-01-11 14:41:32 -08:00
Max Brunsfeld
b01e97be59 Explicitly guard against decorating destroyed markers
Signed-off-by: Nathan Sobo <nathan@github.com>
2016-01-11 14:01:55 -08:00
Wliu
ced74029f8 ⬆️ language-ruby@0.67.1 2016-01-11 16:25:57 -05:00
joshaber
378f6aaabb ⬆️ about@1.2.0. 2016-01-11 16:08:24 -05:00
joshaber
731e782f0d RIP release-notes. 2016-01-11 16:08:07 -05:00
Max Brunsfeld
4ee6b3a492 Merge pull request #10349 from Tyriar/fix_f_keymaps
Fix F11 keymaps
2016-01-11 12:59:43 -08:00
joshaber
2f2a0763a2 Log refresh failures. 2016-01-11 15:19:02 -05:00
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
Machiste Quintana
088b32f9d5 Unfocus spec 2016-01-11 13:44:27 -05:00
Machiste Quintana
78543a7a34 Only disable a package if it isn't already disabled 2016-01-11 13:44:27 -05:00