github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-15 09:05:58 -05:00
Code Issues Packages Projects Releases Wiki Activity
28,568 Commits 140 Branches 571 Tags
00ebe6bbbc2caf88a6dba46d21fb7f144d90b8b2
Commit Graph

28568 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonio Scandurra
00ebe6bbbc Merge branch 'master' into ns-switch-to-display-layers 
# Conflicts:
#	src/text-editor.coffee
 2016-04-26 10:19:39 +02:00
Antonio Scandurra
e3773f24fc 🔥 Delete obsolete code 2016-04-26 10:05:35 +02:00
Damien Guard
891071196f Ensure atom.cmd with --wait returns exit code of 0 for git commit usage #11605 2016-04-25 15:28:22 -07:00
Josh Abernathy
2c91f3b71c Merge pull request #11602 from atom/disentangle-text-editor-pt-1 
Remove TextEditor's dependency on NotificationManager
 2016-04-25 15:56:52 -04:00
joshaber
956e037681 But without the space. 2016-04-25 14:20:54 -04:00
joshaber
d494f065df Update the spec. 2016-04-25 14:12:42 -04:00
joshaber
694af93009 Implement the show cursor scope functionality in the default commands. 2016-04-25 14:12:38 -04:00
joshaber
48e49061e6 Don't need to pass in the notification manager anymore. 2016-04-25 14:12:20 -04:00
joshaber
8bf34d45d7 Don't require notification manager in TextEditor 
Instead expose getCursorScope and let users outside the text editor
show the notification.
 2016-04-25 14:12:07 -04:00
Lee Dohm
4825d7ee4b ⬆️ tabs@0.93.1 2016-04-23 20:15:31 -07:00
Lee Dohm
f6f5c93b01 ⬆️ tabs@0.93.0 2016-04-23 18:31:27 -07:00
Lee Dohm
cf79619292 ⬆️ tree-view@0.206.2 2016-04-23 18:31:07 -07:00
Wliu
e5e1226ac0 ⬆️ language-c@0.51.4 2016-04-23 11:49:20 -04:00
Lee Dohm
93a83306c9 Merge pull request #11564 from atom/ld-add-ctrl-f4-linux 
Add Ctrl+F4 keybinding for Linux
 2016-04-22 16:00:21 -07:00
Lee Dohm
8e78441e32 ⬆️ tabs@0.92.3 2016-04-22 15:16:08 -07:00
Wliu
11170696d5 ⬆️ tree-view@0.206.1 2016-04-22 18:10:53 -04:00
Josh Abernathy
6f75895391 Merge pull request #11562 from atom/use-ohnogit 
Use ohnogit
 2016-04-22 11:49:14 -04:00
Wliu
fdefd54259 Merge pull request #11576 from rldaggie/snippet-documentation 
Update CSON documentation link in snippets.cson
 2016-04-22 11:46:09 -04:00
Riley Dallas
6fc3a364e1 📝 Update CSON documentation link in snippets.cson 2016-04-22 09:30:45 -05:00
Antonio Scandurra
9175194f47 Merge branch 'master' into ns-switch-to-display-layers 
# Conflicts:
#	package.json
 2016-04-22 11:16:04 +02:00
Antonio Scandurra
630cbb7bb7 ⬆️ text-buffer 2016-04-22 11:14:24 +02:00
Antonio Scandurra
d276f93a23 ⬆️ text-buffer 2016-04-22 11:12:15 +02:00
Lee Dohm
53c52342e5 Add Ctrl+F4 keybinding for Linux 2016-04-21 13:36:50 -07:00
joshaber
4a0c946785 ⬆️ status-bar@1.2.4 2016-04-21 15:29:50 -04:00
joshaber
3574613fa3 Don't need resource pool anymore. 2016-04-21 14:19:24 -04:00
joshaber
c0eb8baae0 Provide _refreshingPromise. 2016-04-21 13:55:43 -04:00
joshaber
866a26a754 Update the ignore paths for ohnogit. 2016-04-21 13:25:14 -04:00
joshaber
809d194f31 Update the tests 2016-04-21 13:17:35 -04:00
joshaber
ea57a25a3f ⬆️ ohnogit 2016-04-21 13:08:10 -04:00
Nathan Sobo
60d2160e6d Merge remote-tracking branch 'origin/master' into ns-switch-to-display-layers 2016-04-21 10:43:55 -06:00
Nathan Sobo
5ed30f910c Create synthetic iterator boundaries between open and close tags 
If no non-negative integer exists between an open and close tag code,
we still need to report a boundary there, since close tags always have
to come first at any given iterator position.

:pear:ed with @as-cii
 2016-04-21 10:43:21 -06:00
joshaber
aa96d47160 First pass 2016-04-21 12:36:45 -04:00
Damien Guard
f00ac5ca0a Merge pull request #11544 from atom/dg-windows-command-line-fixes 
Fixes to Windows command-line handling
 2016-04-20 17:57:57 -07:00
Katrina Uychaco
6b317804bc Merge pull request #11547 from atom/ku-add-build-and-sign-grunt-task 
Add `build-and-sign` grunt task for codesigning Atom
 2016-04-20 13:11:28 -07:00
Katrina Uychaco
eb739cd025 Add build-and-sign grunt task for codesigning Atom 2016-04-20 12:40:45 -07:00
Damien Guard
196bc53e6b Ensure Windows Bash script works on all versions 2016-04-20 09:57:41 -07:00
Wliu
9ff5fb21fb ⬆️ language-make@0.22.0 2016-04-20 07:30:34 -04:00
Antonio Scandurra
754cbc2a67 Merge branch 'master' into ns-switch-to-display-layers 
# Conflicts:
#	spec/tokenized-buffer-spec.coffee
 2016-04-20 10:55:56 +02:00
Antonio Scandurra
1e147fbaf1 ⬆️ about 2016-04-20 09:33:04 +02:00
Wliu
79fa94e720 Merge pull request #11534 from atom/wl-language-updates 
Update languages
 2016-04-19 22:08:06 -04:00
Wliu
ea5ad4ae59 Coffeescript comment tokenization no longer matches the newline character 2016-04-19 21:31:53 -04:00
Wliu
25895e1364 ⬆️ language-yaml@0.26.0 2016-04-19 20:40:49 -04:00
Wliu
89a5d01968 ⬆️ language-coffee-script@0.47.0 2016-04-19 20:40:12 -04:00
Wliu
9feb27e107 ⬆️ language-sass@0.47.0 2016-04-19 20:39:24 -04:00
Wliu
405a16ecdc ⬆️ language-java@0.18.0 2016-04-19 20:38:25 -04:00
Damien Guard
42fef8c014 Merge pull request #11488 from atom/dg-fix-windows-specs 
First batch of Windows specs fixes
 2016-04-19 15:48:31 -07:00
Nathan Sobo
48d4285dde Merge pull request #11420 from wvanlint/visible_overlay 
Fixed positioning for overlay
 2016-04-19 15:47:21 -06:00
Nathan Sobo
3bbeb9e680 Merge remote-tracking branch 'origin/master' into ns-switch-to-display-layers 2016-04-19 15:30:00 -06:00
Damien Guard
1500381ac9 Tweaks to the specs improvements from feedback 2016-04-19 14:25:44 -07:00
Damien Guard
53b516a6ec Quote spaces in paths on Win cmd line 2016-04-18 20:48:34 -07:00