github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-24 22:38:20 -05:00
Code Issues Packages Projects Releases Wiki Activity
28,152 Commits 140 Branches 571 Tags
64308bbacb5f253562a059cfce6853859a859cd1
Commit Graph

28152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michelle Tilley
64308bbacb Revert "Revert "Allow pasting white space when autoIndentOnPaste is enabled"" 
This reverts commit 5c03894227.
 2016-03-21 16:27:48 -07:00
Michelle Tilley
449abd7364 Revert "Revert "Add spec for inserting white-space-only lines"" 
This reverts commit fd17457c17.
 2016-03-21 16:27:41 -07:00
Nathan Sobo
fd17457c17 Revert "Add spec for inserting white-space-only lines" 
This reverts commit 746afb98ad.

@BinaryMuse Heads up this is the test associated with the other commit
you reverted. Had to revert it as well to get the build green. Didn’t
see a revert on beta so I’m assuming this is good enough?
 2016-03-21 17:18:47 -06:00
Michelle Tilley
c5ed25a131 ⬆️ apm 2016-03-21 15:32:42 -07:00
Michelle Tilley
439825ea37 ⬆️ settings-view 2016-03-21 14:32:45 -07:00
Michelle Tilley
32a1d21a0d ⬆️ apm 2016-03-21 14:03:25 -07:00
Michelle Tilley
5c03894227 Revert "Allow pasting white space when autoIndentOnPaste is enabled" 
This reverts commit 0088053de4.
 2016-03-20 22:22:33 -07:00
Josh Abernathy
39592599b1 Merge pull request #11201 from atom/bf-async-await 
Remove an unnecessary call to then().
 2016-03-18 13:29:11 -04:00
Michael Bolin
bb8f114dcb Remove an unnecessary call to then(). 
I see that this file has a little use of async/await and many uses of `then()`.
Things would be much less verbose and much more linear if async/await were used throughout.
Would Atom be open to a PR that changes this?

For bonus points, we could also replace `'use babel'` with `/* @flow */` at the top of the file :)
 2016-03-18 09:56:33 -07:00
Wliu
74407fc025 Merge pull request #11194 from fruchtose/destory-typo 
Fix typo: destory -> destroy
 2016-03-17 22:50:11 -04:00
Josh Abernathy
eb72a23039 Merge pull request #11188 from atom/bump-status-bar 
Bump status-bar
 2016-03-17 22:45:22 -04:00
joshaber
dd5886e135 ⬆️ line-ending-selector@0.4.1 2016-03-17 22:19:48 -04:00
joshaber
543015af97 ⬆️ incompatible-packages@0.26.1 2016-03-17 22:19:38 -04:00
Robert Fruchtman
1c5ad8db0f destory -> destroy 2016-03-17 19:11:07 -07:00
joshaber
145396a73f Hwoops 2016-03-17 22:05:15 -04:00
joshaber
85526198f7 ⬆️ line-ending-selector@0.4 2016-03-17 22:03:26 -04:00
joshaber
7863ffbac7 ⬆️ incompatible-packages@0.26 2016-03-17 22:03:16 -04:00
Michelle Tilley
4e9fa72fd1 ⬆️ about 2016-03-17 13:24:59 -07:00
joshaber
ffe13db768 Revert "Revert "⬆️ status-bar@1.2.0"" 
This reverts commit acbd349312.
 2016-03-17 15:51:33 -04:00
joshaber
acbd349312 Revert "⬆️ status-bar@1.2.0" 
This reverts commit 215f120789.
 2016-03-17 13:43:06 -04:00
Hubot
292233f6cb 1.8.0-dev 2016-03-17 12:11:31 -05:00
Daniel Hengeveld
7c4dcf8f58 Merge branch 'master' of github.com:atom/atom 2016-03-17 15:45:41 +01:00
Daniel Hengeveld
e3a5a93b88 ⬆️ settings@0.235.0 2016-03-17 15:45:24 +01:00
joshaber
215f120789 ⬆️ status-bar@1.2.0 2016-03-17 10:34:02 -04:00
joshaber
f48069c5f8 ⬆️ settings@0.234.0 2016-03-16 12:40:40 -04:00
joshaber
690397c91c ⬆️ notifications@0.63.1 2016-03-16 11:57:49 -04:00
Katrina Uychaco
627adc6739 ⬆️ settings-view 
Signed-off-by: Michelle Tilley <binarymuse@github.com>
 2016-03-15 16:41:11 -07:00
Katrina Uychaco
1d149c8f92 ⬆️ apm 
Signed-off-by: Michelle Tilley <binarymuse@github.com>
 2016-03-15 16:36:54 -07:00
joshaber
7703240bdf ⬆️ notifications@0.63.0 2016-03-15 13:59:07 -04:00
joshaber
147518d86d ⬆️ status-bar@1.1.2 2016-03-15 12:05:24 -04:00
joshaber
047a62f9e1 ⬆️ git-diff@1.0.1 2016-03-15 12:05:16 -04:00
Josh Abernathy
baec8a2e51 Merge pull request #11166 from atom/when-in-rome 
Note where GitRepositoryAsync deviates from its synchronous predecessor
 2016-03-15 12:04:23 -04:00
joshaber
15b13e3ddc Note the changes to GitRepository. 2016-03-15 10:49:36 -04:00
joshaber
8f9ab771a7 Revert "Match GitRepository's responses to null paths." 
This reverts commit 50f8f8e7e9.
 2016-03-15 10:44:00 -04:00
joshaber
34698d5768 Revert "And again." 
This reverts commit a2a6ed05c5.
 2016-03-15 10:43:57 -04:00
joshaber
0a6e51f665 ⬆️ package-generator@1.0.0 2016-03-15 10:35:44 -04:00
Wliu
1457e27249 ⬆️ language-sass@0.46.0 2016-03-15 09:56:03 -04:00
Wliu
9c8d947628 ⬆️ language-clojure@0.20.0 2016-03-14 22:33:56 -04:00
Wliu
164b363a32 ⬆️ language-csharp@0.12.0 2016-03-14 20:26:37 -04:00
joshaber
a2a6ed05c5 And again. 2016-03-14 16:40:55 -04:00
joshaber
50f8f8e7e9 Match GitRepository's responses to null paths. 
Fixes https://github.com/atom/git-diff/issues/93.
 2016-03-14 16:28:36 -04:00
Josh Abernathy
2b5a540a91 Merge pull request #11162 from atom/pr/10930 
BufferedProcess: search only new data for new lines rather than entire buffer, take 2
 2016-03-14 15:59:23 -04:00
joshaber
0c67fd61ff Hi lint. 2016-03-14 14:57:58 -04:00
Michelle Tilley
e69b3bb839 ⬆️ tree-view 
Signed-off-by: Katrina Uychaco <kuychaco@github.com>

(cherry picked from commit 70728d8e94)
 2016-03-14 11:19:05 -07:00
joshaber
3601c1c2a8 Test the whole output too. 2016-03-14 14:18:06 -04:00
joshaber
d441da9c38 Test it with a lot of content. 2016-03-14 14:12:47 -04:00
joshaber
66971abe25 Don't need that trailing space. 2016-03-14 14:12:31 -04:00
joshaber
d1c8fff86c Pull line length out into its own variable. 2016-03-14 13:42:05 -04:00
joshaber
2a2e22a759 Merge branch 'master' into pr/10930 2016-03-14 13:34:03 -04:00
Lee Dohm
5e8752f7d8 Merge pull request #11153 from atom/fix-node-env 
Fix node env
 2016-03-14 09:35:43 -07:00