Commit Graph

27564 Commits

Author SHA1 Message Date
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
Kevin Sawicki
5ce50a5c6f Don't bundle nodegit vendor folder 2016-02-08 08:37:11 -08:00
joshaber
130b0c7fb6 ⬆️ autoflow@0.27 2016-02-08 11:13:38 -05:00
Wliu
5127789a68 Update tokenized buffer spec 2016-02-07 21:26:13 -05:00
Wliu
355d6c5cd4 ⬆️ language-javascript@0.110.0 2016-02-07 21:23:50 -05:00
Wliu
17bf2b40ab ⬆️ language-json@0.17.4 2016-02-05 20:49:54 -05:00
Josh Abernathy
a1843b989f Merge pull request #10708 from atom/flow-implies-babel
Flow implies Babel
2016-02-05 17:30:06 -05:00
joshaber
563984a7b2 Test it. 2016-02-05 16:16:38 -05:00
joshaber
f2d2ff6f3c The flow annotation implies babel. 2016-02-05 16:15:48 -05:00
Daniel Hengeveld
39721f4349 Merge pull request #10695 from atom/dh-bump-atom-autocomplete-api
⬆️autocomplete-atom-api@0.10.0
2016-02-04 21:15:28 -08:00
Daniel Hengeveld
f9f7bee0ae :arrow_up:autocomplete-atom-api@0.10.0 2016-02-04 17:39:15 -08:00
Kevin Sawicki
c5d83742c1 Merge pull request #10694 from atom/cache-other-node-modules-folders-on-travis
Cache other node_modules folders on Travis
2016-02-04 17:08:26 -08:00