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,628 Commits 140 Branches 571 Tags
57442781ec6979e66bb5819a0782b75dfa15cd02
Commit Graph

5574 Commits

Author SHA1 Message Date
Antonio Scandurra
57442781ec Fix bug when positioning cursors after the fold-marker 2016-04-28 13:31:28 +02:00
Antonio Scandurra
ce4b2fa810 Merge branch 'master' into ns-switch-to-display-layers 
# Conflicts:
#	src/display-buffer.coffee
#	src/text-editor.coffee
#	src/tokenized-buffer.coffee
 2016-04-27 18:16:03 +02:00
Wliu
6bb5e09af9 ⬆️ language-shellscript@0.22.0 2016-04-26 16:46:00 -04:00
joshaber
53b7a20ad7 ⬆️ status-bar@1.2.6 2016-04-26 11:40:56 -04:00
joshaber
e1c17ed856 ⬆️ status-bar@1.2.5 2016-04-26 11:17:20 -04:00
joshaber
33a9240fe1 ⬆️ ohnogit@0.0.11 2016-04-26 09:45:56 -04:00
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
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
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
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
joshaber
4a0c946785 ⬆️ status-bar@1.2.4 2016-04-21 15:29:50 -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
joshaber
aa96d47160 First pass 2016-04-21 12:36:45 -04: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
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
Nathan Sobo
3bbeb9e680 Merge remote-tracking branch 'origin/master' into ns-switch-to-display-layers 2016-04-19 15:30:00 -06:00
Michelle Tilley
8516f1914e ⬆️ fuzzy-finder@1.0.5 2016-04-18 15:20:18 -07:00
Wliu
89bc3c8888 ⬆️ language-git@0.13.0 2016-04-18 17:31:35 -04:00
Wliu
ee4ca3fd6c ⬆️ language-sql@0.21.0 2016-04-18 16:32:20 -04:00
Wliu
73f65fc821 ⬆️ language-xml@0.34.5 2016-04-18 16:30:43 -04:00
Wliu
92fd313a6a ⬆️ language-gfm@0.86.0 2016-04-18 16:29:58 -04:00
Antonio Scandurra
c002d5d6ac Merge branch 'master' into ns-switch-to-display-layers 2016-04-17 10:06:16 +02:00
Lee Dohm
8ece1ee909 ⬆️ tabs@0.92.2 2016-04-15 20:00:21 -07:00
Lee Dohm
30d4b93757 ⬆️ notifications@0.63.2 2016-04-15 19:56:25 -07:00
Antonio Scandurra
7eba972f39 Merge branch 'master' into ns-switch-to-display-layers 2016-04-15 17:39:15 +02:00
Wliu
b05ec8f683 ⬆️ exception-reporting@0.38.1 2016-04-15 11:14:47 -04:00
Katrina Uychaco
e230841b57 ⬆️ tree-view 2016-04-13 20:46:48 -07:00
Katrina Uychaco
07822b975a ⬆️ open-on-github 2016-04-13 20:34:28 -07:00
Antonio Scandurra
3270abe1f6 ⬆️ text-buffer 2016-04-13 18:42:52 +02:00
Antonio Scandurra
581dd45418 Merge branch 'master' into ns-switch-to-display-layers 2016-04-13 13:54:13 +02:00
Antonio Scandurra
373b931c51 ⬆️ text-buffer 2016-04-13 13:52:28 +02:00
Hubot
c936ed96dc 1.9.0-dev 2016-04-12 19:16:53 -05:00
Katrina Uychaco
7d13ba5d4e ⬆️ tree-view 2016-04-12 15:48:37 -07:00
Katrina Uychaco
dcefde8838 ⬆️ find-and-replace 
(cherry picked from commit 0676cdd863)
 2016-04-11 21:25:09 -07:00
Katrina Uychaco
0f5841376c ⬆️ tree view 
(cherry picked from commit a3b844ee00)
 2016-04-11 21:22:26 -07:00
joshaber
35982bc6ed ⬆️ status-bar@1.2.3 2016-04-11 13:47:06 -04:00
SEAPUNK
a6e90ba7ee ⬆️ nodegit@0.12.2 
This adds support for 32-bit linux systems
 2016-04-11 10:55:04 -04:00
Antonio Scandurra
6b2bfd5656 Merge branch 'master' into ns-switch-to-display-layers 2016-04-11 13:15:00 +02:00