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,727 Commits 140 Branches 571 Tags
506a4b3dcc90aa827529ed36c5ade011124be4ed
Commit Graph

5606 Commits

Author SHA1 Message Date
Wliu
506a4b3dcc Merge remote-tracking branch 'master' into wl-update-language-javascript 
# Conflicts:
#	package.json
 2016-05-04 15:51:11 -04:00
Wliu
f78dfdf9b2 ⬆️ language-javascript@0.119.0 2016-05-04 15:49:05 -04:00
Antonio Scandurra
89d6b1fcce ⬆️ text-buffer 2016-05-04 18:57:07 +02:00
Antonio Scandurra
3b46d7f50b Merge branch 'master' into ns-switch-to-display-layers 
# Conflicts:
#	src/text-editor.coffee
 2016-05-04 18:56:45 +02:00
Michelle Tilley
512f1fb540 ⬆️ symbols-view@0.113.0 2016-05-04 11:56:17 +02:00
Antonio Scandurra
6c6f8fc341 ⬆️ autocomplete-plus 2016-05-04 10:15:02 +02:00
simurai
b9dbb81bd5 Revert "⬆️ language-sass@0.50.0" 
This reverts commit d29e96e358.
 2016-05-04 12:05:04 +09:00
Wliu
d29e96e358 ⬆️ language-sass@0.50.0 2016-05-03 20:47:02 -04:00
Lee Dohm
0e194f1021 ⬆️ line-ending-selector@0.5.0 2016-05-03 16:04:04 -07:00
Lee Dohm
d6d47c422c ⬆️ settings-view@0.236.0 2016-05-03 09:21:21 -07:00
Antonio Scandurra
6b4c082bbf ⬆️ text-buffer 2016-05-03 13:06:16 +02:00
Lee Dohm
ab24ce37fe Merge pull request #11669 from tcyrus/patch-1 
Update package.json
 2016-05-02 17:02:30 -07:00
Lee Dohm
dd24e3b223 ⬆️ tabs@0.93.2 2016-05-02 13:19:19 -07:00
Timothy Cyrus
874be7d242 Update package.json 
Update `marked` to fix sanitization issue on david-dm
 2016-05-02 10:47:49 -04:00
Lee Dohm
57bf8f797b ⬆️ encoding-selector@0.22.0 2016-05-01 10:32:21 -07:00
Antonio Scandurra
02d9245c05 Merge branch 'master' into ns-switch-to-display-layers 2016-04-30 11:10:17 +02:00
Antonio Scandurra
005022567b Merge pull request #11348 from atom/wl-drewmnoel-electron 
Update Electron to 0.36.12
 2016-04-30 09:19:17 +02:00
Antonio Scandurra
539fc4090b ⬆️ bookmarks 2016-04-30 01:34:49 +02:00
Wliu
8d9324e234 ⬆️ language-sass@0.49.0 2016-04-29 18:30:19 -04:00
Wliu
b975c1ffc1 ⬆️ language-sass@0.48.0 2016-04-29 18:15:41 -04:00
Antonio Scandurra
50e3f1f789 ⬆️ text-bufffer 2016-04-29 14:06:05 +02:00
Lee Dohm
7d463d9dd0 ⬆️ about@1.5.2 2016-04-28 15:30:38 -07:00
Antonio Scandurra
2c5340c70f ⬆️ text-buffer 2016-04-28 17:29:59 +02:00
Antonio Scandurra
57442781ec Fix bug when positioning cursors after the fold-marker 2016-04-28 13:31:28 +02:00
Lee Dohm
b4733732dc ⬆️ autocomplete-plus@2.30.0 2016-04-27 10:35:39 -07: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