github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-25 14:59:03 -05:00
Code Issues Packages Projects Releases Wiki Activity
27,575 Commits 140 Branches 571 Tags
582e11a57ef259f2d52bd2e076b0055be1e51bbf
Commit Graph

27575 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Katrina Uychaco
582e11a57e Merge pull request #11009 from atom/ku-dont-destroy-pane-if-replacing-last-pending-item 
Don't destroy pane if replacing last pending item
 2016-03-03 23:31:17 -08:00
Max Brunsfeld
683331643f Remove accidentally-included specs from cherry-pick conflict 2016-03-02 13:42:31 -08:00
Josh Abernathy
2e940b4426 Merge pull request #11022 from atom/windows-git-fixes 
Windows git fixes
v1.6.0-beta7 		2016-03-02 10:03:50 -05:00
Max Brunsfeld
435a01cb3e 1.6.0-beta7 2016-03-01 11:36:49 -08:00
Max Brunsfeld
6b0995996f Merge pull request #10967 from b6pzeusbc54tvhw5jgpyw8pwz2x6gs/change-getLineCount-to-getScreenLineCount 
Fix a inconsistent getLineCount() use
 2016-03-01 11:34:26 -08:00
Michelle Tilley
202ef59f72 ⬆️ tabs 
Signed-off-by: Katrina Uychaco <kuychaco@github.com>
 2016-03-01 11:29:15 -08:00
Katrina Uychaco
987c6927ee ⬆️ find-and-replace 
Signed-off-by: Michelle Tilley <binarymuse@github.com>
 2016-03-01 11:24:57 -08:00
Michelle Tilley
c077a3fdec ⬆️ tree-view 
Signed-off-by: Katrina Uychaco <kuychaco@github.com>
 2016-03-01 11:23:43 -08:00
Michelle Tilley
cdab46d802 Merge pull request #11001 from atom/mkt-change-did-terminate-pending-state-to-item-did-terminate 
onDidTerminatePendingState ➡︎ onItemDidTerminatePendingState
 2016-03-01 11:21:36 -08:00
Michelle Tilley
4cd9c08bc1 Merge pull request #10959 from atom/ku-move-pending-state-from-item-to-pane 
(WIP) Refactor pending state to live in pane instead of items
 2016-03-01 11:20:31 -08:00
Max Brunsfeld
6a0c541cfb Merge pull request #10972 from atom/mb-new-branching-model 
Update build scripts to use the new railcar branching model
 2016-02-29 14:43:52 -08:00
joshaber
532c45b85e Revert "1.6.0-beta7" 
This reverts commit 35262fa333.
v1.6.0-beta6 		2016-02-26 14:34:51 -05:00
joshaber
35262fa333 1.6.0-beta7 2016-02-26 14:33:58 -05:00
Josh Abernathy
0c64865fb3 Merge pull request #10975 from atom/update-nodegit 
Update nodegit
 2016-02-26 09:45:50 -05:00
Katrina Uychaco
8bd4c997af v1.6.0-beta6 2016-02-22 14:53:44 -08:00
Katrina Uychaco
6416e43d7f ⬆️ tree-view v1.6.0-beta5 2016-02-22 11:42:17 -08:00
Katrina Uychaco
a5f842889a Merge pull request #10872 from atom/ku-terminate-pending-state 
Terminate pending state for opened file if pending option is false
 2016-02-22 11:08:08 -08:00
joshaber
8d4e495a71 1.6.0-beta5 2016-02-22 12:57:06 -05:00
Josh Abernathy
2a9701ac7c Merge pull request #10926 from atom/fix-case-sensitive-path-relativization 
Fix case-preserving path relativization
 2016-02-22 12:50:26 -05:00
joshaber
6d0d388e04 1.6.0-beta4. v1.6.0-beta4 2016-02-17 16:37:40 -05:00
Katrina Uychaco
f0eb62ec73 Merge pull request #10846 from atom/ku-pending-tabs-option 
Add core setting for pending tabs configuration
 2016-02-17 13:35:08 -08:00
Josh Abernathy
e3f66c16ab Merge pull request #10827 from atom/subdir-status-fixes 
Port repository subdirectory status fixes to async repo
 2016-02-16 22:05:00 -05:00
joshaber
02fd706c7e 1.6.0-beta3. v1.6.0-beta3 2016-02-12 15:36:54 -05:00
joshaber
88fd1ef89d Merge branch 'stable' into beta 2016-02-12 15:36:41 -05:00
joshaber
3e71894a59 1.5.3. v1.5.3 2016-02-12 15:35:18 -05:00
Josh Abernathy
3cc911fa79 Merge pull request #10797 from atom/fix-status-with-multiple-paths 
Fix status with multiple paths
 2016-02-12 15:35:05 -05:00
Max Brunsfeld
05731e3912 1.5.2 v1.5.2 2016-02-11 11:02:12 -08:00
Max Brunsfeld
de794ab826 Merge branch 'stable' into beta v1.6.0-beta2 2016-02-11 10:48:11 -08:00
Max Brunsfeld
314867201f Merge pull request #10768 from atom/mb-remove-changing-package-json-fields 
Temporarily disable deserializers & viewProviders metadata fields
 2016-02-11 10:20:16 -08:00
Max Brunsfeld
78c5fd42da Temporarily disable deserializers & viewProviders metadata fields 2016-02-10 17:53:15 -08:00
Katrina Uychaco
7ed8623480 1.6.0-beta2 2016-02-10 17:05:47 -08:00
Katrina Uychaco
262459829c ⬆️ tree-view 2016-02-10 17:04:04 -08:00
joshaber
d759eb022d Merge branch 'stable' into beta v1.6.0-beta1 2016-02-10 15:19:48 -05:00
joshaber
88524b19ce 1.5.1 v1.5.1 2016-02-10 15:17:43 -05:00
Josh Abernathy
b7da70a7e9 Merge pull request #10758 from atom/fix-status-in-subdir 
Fix status in subdir
 2016-02-10 15:17:34 -05:00
joshaber
1b416c789e 1.6.0-beta0 v1.6.0-beta0 2016-02-09 13:40:37 -05:00
joshaber
69df5d0836 1.5.0 v1.5.0 2016-02-09 13:40:36 -05:00
Josh Abernathy
60140577be Merge pull request #10673 from atom/wl-apm-cmd-again 
Copy apm.cmd to the build directory when building
 2016-02-09 11:17:45 -05:00
Nathan Sobo
4597d1e436 Merge pull request #7953 from acontreras89/ac-pane-split 
Improve multi-pane API
 2016-02-08 17:51:16 -08:00
Aaron Contreras
cbff7394c6 🐛 Reuse scroll position on text editor's copy. Fixes #8765 
✅ Update specs to avoid regressions
 2016-02-09 00:36:37 +01:00
Aaron Contreras
ee86cee4e0 ✅ Add specs for new commands, update old specs 2016-02-09 00:36:37 +01:00
Aaron Contreras
6b118a8061 Add convenience commands to copy/move active item between panes 
Give focus to destination pane and set the copied/moved item as active
 2016-02-09 00:36:37 +01:00
Wliu
b70713283c Merge pull request #10725 from atom/wl-update-language-js 
Update language-javascript to 0.110.0
 2016-02-08 17:36:10 -05:00
Wliu
8ca1071168 Update presenter specs 2016-02-08 16:52:47 -05:00
Ben Ogle
f5d13e3e3c ⬆️ status-bar@0.83.0 2016-02-08 12:08:08 -08:00
Kevin Sawicki
ed43eda139 Merge pull request #10712 from atom/ks-ignore-more-native-source-files 
Ignore more native source files
 2016-02-08 08:57:48 -08:00
Kevin Sawicki
99c3ece3d3 Don't bundle nodegit's include headers 2016-02-08 08:37:11 -08:00
Kevin Sawicki
67ed26bc0d Don't bundle nodegit's node-pre-gyp module 2016-02-08 08:37:11 -08:00
Kevin Sawicki
86b9aa2dd1 Don't bundle native module files 2016-02-08 08:37:11 -08:00
Kevin Sawicki
2525cbbd5e Ignore nodegit src .cc/.h files 2016-02-08 08:37:11 -08:00