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

28134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Lee Dohm
ed744c12a9 Move location of call to environmentHelpers.normalize 2016-03-14 08:43:16 -07:00
Wliu
579b6b7a04 ⬆️ settings-view@0.232.6 2016-03-13 18:02:50 -04:00
Wliu
ad91f0ffc2 ⬆️ packages to fix Electron deprecations 
about@1.4.1
link@0.31.1
open-on-github@1.0.1
settings-view@0.232.5

Refs atom/atom#10983
 2016-03-13 15:55:39 -04:00
Wliu
4798d6d7ce ⬆️ tree-view@0.203.1 
Refs #10983
 2016-03-13 13:18:14 -04:00
Wliu
c99a272f01 ⬆️ language-json@0.17.6 2016-03-12 16:10:45 -05:00
Lee Dohm
430a0e049a Merge pull request #11054 from atom/ld-osx-environment 
Patch Environment On OSX And Allow A Different Environment Per Window
 2016-03-11 20:25:19 -08:00
Lee Dohm
01a1a1d80c Swap _.clone for Object.assign 2016-03-11 16:57:02 -08:00
Lee Dohm
63ec054161 Rename environment -> environmentHelpers 2016-03-11 16:51:50 -08:00
Nathan Sobo
2ad2f161fa Merge pull request #11078 from wvanlint/opt_in_registration 
Add TextEditors to the registry only when opting in
 2016-03-11 15:37:07 -07:00
Wliu
f671d5c5cd ⬆️ language-ruby@0.68.3 2016-03-11 17:32:13 -05:00
Lee Dohm
edd91839a8 ⬆️ language-ruby@0.68.2 2016-03-11 13:34:03 -08:00
Damien Guard
5cefb10546 Merge pull request #8793 from BrainCrumbz/squirrel-update-shortcut-spec-fix-squash 
squirrel-update test on desktop shortcut groups too many assertions
 2016-03-11 11:38:06 -08:00
Michelle Tilley
e4ab2c9b6a Merge branch 'ku-load-git-packages' 2016-03-11 10:25:51 -08:00
Willem Van Lint
466e554ee1 Add TextEditors to the registry on opt-in only 2016-03-10 22:51:51 -08:00
simurai
806c194fe2 Merge pull request #11127 from atom/sm-markdown-preview-158 
Bump markdown-preview@v0.158.0
 2016-03-11 14:38:54 +09:00
Michelle Tilley
383174d380 Load apm path from config 
Signed-off-by: Katrina Uychaco <kuychaco@github.com>
 2016-03-10 21:28:40 -08:00
Lee Dohm
bd4ef0a443 ⬆️ tabs@0.92.0 2016-03-10 20:17:19 -08:00
Joe Fitzgerald
61fb12bf9a Unfocus Spec 2016-03-10 19:59:26 -07:00