github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-25 14:59:03 -05:00
Code Issues Packages Projects Releases Wiki Activity
26,946 Commits 140 Branches 571 Tags
v1.5.0-beta0
Commit Graph

26946 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
joshaber
339a7f511e 1.5.0-beta0 v1.5.0-beta0 2016-01-13 16:29:23 -05:00
joshaber
6d61cc560e Merge branch 'beta' 2016-01-13 15:33:03 -05:00
joshaber
d229fed7e7 Merge pull request #10377 from atom/remove-release-notes 
Remove release-notes
 2016-01-13 15:11:55 -05:00
Josh Abernathy
3ed8f0165c Merge pull request #10377 from atom/remove-release-notes 
Remove release-notes
 2016-01-13 15:05:26 -05:00
Max Brunsfeld
18f2f28ad4 Merge branch 'beta' 
Conflicts:
	package.json
 2016-01-13 10:35:47 -08:00
Max Brunsfeld
2c4df2d69b Merge branch 'stable' into beta 
Conflicts:
	package.json
	spec/workspace-spec.coffee
 2016-01-13 10:30:58 -08:00
joshaber
beb1456f69 ⬆️ about@1.3.0 2016-01-13 13:30:03 -05:00
Max Brunsfeld
57aa70cc87 Merge pull request #10395 from atom/mb-disable-babel-logging 
Stop babel from logging to stderr during compilation
 2016-01-13 09:40:45 -08:00
Josh Abernathy
68fb9ab2cf Merge pull request #10361 from atom/mq-disable-package 
Only disable a package if it isn't already disabled
 2016-01-13 09:49:12 -05:00
Max Brunsfeld
680e123f88 Prevent babel from logging to stderr 2016-01-12 15:42:44 -08:00
Max Brunsfeld
bc69e1624b Don't rely on compile cache in babel compilation specs 2016-01-12 15:41:26 -08:00
Josh Abernathy
38d6ded9c4 Merge pull request #10359 from ypresto/copy-project-path 
Add copy project path command to text-editor
 2016-01-12 11:15:09 -05:00
joshaber
0a57f377f8 Merge branch 'master' into remove-release-notes 2016-01-12 11:13:01 -05:00
Wliu
53950f6687 ⬆️ language-ruby@0.68.0 2016-01-12 10:14:40 -05:00
Max Brunsfeld
389d3d6760 ⬆️ spell-check 2016-01-11 15:49:13 -08:00
Max Brunsfeld
eaab862e64 ⬆️ spell-check 2016-01-11 15:39:53 -08:00
Max Brunsfeld
945fcf20ec Merge pull request #10379 from atom/mb-ns-guard-against-decorating-destroyed-markers 
Explicitly guard against decorating destroyed markers
 2016-01-11 14:41:32 -08:00
Max Brunsfeld
b01e97be59 Explicitly guard against decorating destroyed markers 
Signed-off-by: Nathan Sobo <nathan@github.com>
 2016-01-11 14:01:55 -08:00
Wliu
ced74029f8 ⬆️ language-ruby@0.67.1 2016-01-11 16:25:57 -05:00
joshaber
378f6aaabb ⬆️ about@1.2.0. 2016-01-11 16:08:24 -05:00
joshaber
731e782f0d RIP release-notes. 2016-01-11 16:08:07 -05:00
Max Brunsfeld
4ee6b3a492 Merge pull request #10349 from Tyriar/fix_f_keymaps 
Fix F11 keymaps
 2016-01-11 12:59:43 -08:00
Josh Abernathy
c02d7995ce Merge pull request #10341 from atom/mq-mac-menu-order 
Use OS X Human Interface Guidelines compliant menu order
 2016-01-11 14:24:16 -05:00
Machiste Quintana
088b32f9d5 Unfocus spec 2016-01-11 13:44:27 -05:00
Machiste Quintana
78543a7a34 Only disable a package if it isn't already disabled 2016-01-11 13:44:27 -05:00
Machiste Quintana
e7f15d06e4 ✅ Add failing spec for disabling an already disabled package 2016-01-11 13:44:27 -05:00
Nathan Sobo
2acb9c1ee8 ⬆️ settings-view 2016-01-11 11:31:38 -07:00
Nathan Sobo
339489997b ⬆️ tree-view 2016-01-11 11:31:31 -07:00
Nathan Sobo
ff0a62833f Pin jQuery to 2.1.4 2016-01-11 11:26:31 -07:00
Nathan Sobo
f44a26fa56 Merge pull request #10375 from atom/fire-changelog 
🔥 CHANGELOG.md
 2016-01-11 10:25:14 -07:00
Josh Abernathy
9e6136470e 🔥 CHANGELOG.md 
Having this file still here is confusing. Do we use it, or do we use https://github.com/benogle/pr-changelog?

Let's apply 🔥 if we're not gonna keep it up to date.

/cc @mnquintana
 2016-01-11 12:17:08 -05:00
Daniel Hengeveld
d48f3aaed8 ⬆️ settings-view@0.232.1 
refs https://github.com/atom/settings-view/pull/698
 2016-01-11 10:06:01 -05:00
Wliu
35f262f411 ⬆️ language-html@0.44.0 2016-01-10 20:41:43 -05:00
Wliu
0d8a3847cd Merge pull request #10365 from svanharmelen/language-go@0.42.0 
⬆️ language-go@0.42.0
 2016-01-10 17:24:41 -05:00
Sander van Harmelen
6b44562a22 ⬆️ language-go@0.42.0 
This version fixes #10272
 2016-01-10 23:11:41 +01:00
Machiste Quintana
859d8605a9 Merge branch 'master' into mq-mac-menu-order 2016-01-10 14:49:45 -05:00
Yuya Tanaka
d4c8770176 Add copy project path command to text-editor 2016-01-10 19:35:34 +09:00
Daniel Imms
235e489f6e Fix F11 keymaps 
Function key keymaps don't work when they feature upperface 'F' characters.
They still tend to work because they typically have an application menu item
which is associated with it and falled back upon. The main difference is that
the originalEvent (KeyboardEvent) is not retained when doing this fallback as
Atom thinks that the menu item was pressed instead of the keymap.

Fixes #10287
 2016-01-09 04:20:34 -08:00
Nathan Sobo
db74f4a8f0 Merge pull request #10178 from atom/ku-pending-editor 
Open file in pending state on single click
 2016-01-08 14:45:14 -07:00
Katrina Uychaco
5738b14eda 🎨 2016-01-08 13:39:46 -08:00
Max Brunsfeld
8bbab51959 Merge pull request #10336 from atom/wl-backport-tabs-fix 
Backport identical tab names fix
v1.3.3 		2016-01-08 11:41:10 -08:00
Max Brunsfeld
b8c6fec2f6 Merge pull request #10334 from atom/wl-backport-fullscreen-fix 
Backport Electron stability fixes to 1.3
 2016-01-08 11:40:26 -08:00
Machiste Quintana
1a13913168 Use OS X Human Interface Guidelines compliant menu order 
Fixes https://github.com/atom/atom/issues/10302
 2016-01-08 12:00:24 -05:00
Machisté N. Quintana
dd1eb750fe Merge pull request #10332 from atom/ld-reload-window-menu 
Relocate and rename 'View > Reload' to prevent confusion
 2016-01-08 11:56:01 -05:00
Wliu
0bb8e21c04 ⬆️ language-json@0.17.3 2016-01-07 22:49:51 -05:00
Wliu
f527504402 ⬆️ language-python@0.43.0 2016-01-07 22:49:30 -05:00
Max Brunsfeld
8f1c49cb5c Merge pull request #9636 from DouweM/unique-title 
Use unique text editor title in window and tab titles
 2016-01-07 22:38:10 -05:00
Lee DohM
e9bb1f9220 Sort alphabetically 2016-01-07 19:31:03 -08:00
Cheng Zhao
ad76d3396b ⬆️ electron@0.34.5 
Fix #9584.
 2016-01-07 22:00:57 -05:00
Lee DohM
de043956bb Relocate and rename 'View > Reload' to prevent confusion 2016-01-07 18:51:26 -08:00