github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-25 23:08:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
27,574 Commits 140 Branches 571 Tags
683331643fb8ed0d2deaa1aa051ff07ea5afbbf0
Commit Graph

13845 Commits

Author SHA1 Message Date
Josh Abernathy
2e940b4426 Merge pull request #11022 from atom/windows-git-fixes 
Windows git fixes
 2016-03-02 10:03:50 -05: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
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
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
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
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
88fd1ef89d Merge branch 'stable' into beta 2016-02-12 15:36:41 -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
de794ab826 Merge branch 'stable' into beta 2016-02-11 10:48:11 -08:00
Max Brunsfeld
78c5fd42da Temporarily disable deserializers & viewProviders metadata fields 2016-02-10 17:53:15 -08:00
joshaber
d759eb022d Merge branch 'stable' into beta 2016-02-10 15:19:48 -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
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
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
joshaber
f2d2ff6f3c The flow annotation implies babel. 2016-02-05 16:15:48 -05:00
Ian Olsen
c098acb615 Merge pull request #9798 from atom/dr-wait-windows 
Make --wait work on Windows
 2016-02-04 13:57:51 -08:00
Lee Dohm
22d332a8d9 Change object section heading to be more descriptive 2016-02-03 16:46:40 -08:00
Lee Dohm
cfca20db79 Merge pull request #10552 from dirk-thomas/patch-1 
improve docs about grouped settings
 2016-02-03 16:44:45 -08:00
Lee Dohm
082d99fc18 Merge pull request #10219 from pimentel/master 
update documentation for rowRangeForParagraphAtBufferRow
 2016-02-03 16:34:25 -08:00
Max Brunsfeld
49776d114c Merge branch 'beta' 2016-02-02 12:00:08 -08:00
Max Brunsfeld
6d56185300 Merge branch 'stable' into beta 2016-02-02 11:59:42 -08:00
Max Brunsfeld
19349edc7a Only add local paths to recent documents list 
Also, add them in Workspace::open and not AtomEnvironment::openLocations
so that files opened in an existing window will also be added to the
list
 2016-02-02 11:16:14 -08:00
Aaron Contreras
500afb0f20 Improve split API, add new commands and rewrite existing ones 
Allow empty splits, as well as moving (instead of copying) active item
 2016-02-02 00:50:10 +01:00
simurai
4cf8abc786 🎨 Rename top/bottom-bar to header/footer 2016-02-01 11:34:08 -08:00
simurai
c2381e05e5 Add top/bottom bar API 2016-02-01 11:34:08 -08:00
simurai
3ced484718 Add top-bar and bottom-bar elements 2016-02-01 11:34:08 -08:00
joshaber
a01dc47e69 Merge branch 'stable' into beta 2016-02-01 14:01:52 -05:00
Max Brunsfeld
42d509ca4e Merge pull request #10062 from atom/mb-emit-state-update-on-model-scroll 
Emit state update when model's scroll position is changed
 2016-01-27 15:34:53 -08:00
Max Brunsfeld
ff2751bbef Merge pull request #10581 from atom/mb-fix-legacy-config-api 
Require package's main module in legacy activateConfig method
 2016-01-27 15:32:52 -08:00
Ben Ogle
8acb742c30 Merge pull request #7916 from oggy/descriptive-enums 
Support descriptions for enum values in config.
 2016-01-26 14:45:00 -08:00
Max Brunsfeld
18a1f06022 Merge pull request #10581 from atom/mb-fix-legacy-config-api 
Require package's main module in legacy activateConfig method
 2016-01-25 15:28:50 -08:00
Max Brunsfeld
d055a686ae Merge pull request #10486 from atom/bf-fix-submenu-items 
Honor `created()` function for an item in a submenu.
 2016-01-25 13:31:25 -08:00
Max Brunsfeld
dc903fa124 Require package's main module in legacy activateConfig method 2016-01-25 12:42:12 -08:00
Max Brunsfeld
c4adc38273 Merge branch 'stable' into beta 2016-01-25 10:29:29 -08:00
Dirk Thomas
13f0987ede improve docs about grouped settings 
See https://github.com/atom/settings-view/pull/698#issuecomment-171725215
 2016-01-22 19:46:51 -08:00
joshaber
191e607bd6 Merge branch 'stable' 2016-01-22 17:01:03 -07:00
Josh Abernathy
91eb2b2a28 Merge pull request #10293 from atom/as-more-flexible-inputs-for-blob-store 
Ignore errors when loading an invalid blob store
 2016-01-22 11:44:29 -07:00
joshaber
60c33f6bc9 Open submodules directly instead of searching. 2016-01-19 16:35:36 -07:00
joshaber
50c74499dc Link to the libgit2 issue. 2016-01-19 16:34:30 -07:00
Michael Bolin
9423ec8b3a Renamed local variables as recommended by @ssorallen. 2016-01-19 12:37:38 -08:00
joshaber
514842ca77 If we can't refresh a submodule, drop it. 2016-01-19 11:59:16 -05:00
Josh Abernathy
ab02a7b5a9 Merge pull request #10445 from atom/update-nodegit 
Update nodegit
 2016-01-19 08:34:35 -05:00
Michael Bolin
3d5386e514 Honor created() function for an item in a submenu. 
Fixes #10483.
 2016-01-18 16:39:19 -08:00
Michael Bolin
04b100fab8 Revert "Honor created() function for an item in a submenu." 
This reverts commit 9917ed39aa.

Sorry, apparently I don't know how to use Git anymore.
I'm just trying to put this up for review and it went straight
to master instead.
 2016-01-18 16:36:49 -08:00
Michael Bolin
9917ed39aa Honor created() function for an item in a submenu. 
Fixes #10483.
 2016-01-18 16:34:36 -08:00
Michael Bolin
f8d20760af Revert "Honor created() function for an item in a submenu." 
This reverts commit 962308509b.
 2016-01-18 16:33:35 -08:00
Michael Bolin
962308509b Honor created() function for an item in a submenu. 
Fixes #10483.
 2016-01-18 16:32:16 -08:00