github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-25 06:48:28 -05:00
Code Issues Packages Projects Releases Wiki Activity
25,123 Commits 140 Branches 571 Tags
af83249d4e69b9aa87e84a396104aa01daafb591
Commit Graph

25123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan Sobo
af83249d4e Merge branch 'stable' into beta 2015-09-23 16:59:50 -06:00
Ivan Zuzak
abe924f231 Assign error in catch block for clarity v1.0.16 2015-09-23 10:07:01 -06:00
Ivan Žužak
17b68160cd Fix coffelint error causing Travis builds to fail 
Currently, running coffeelint produces this error and causes Travis
builds to fail:

```
Running "coffeelint:src" (coffeelint) task
src/command-installer.coffee
  ✖  line 73  Line contains inconsistent indentation  Expected 2 got 0
✖ 1 error
Warning: Task "coffeelint:src" failed. Use --force to continue.
Error: Task "coffeelint:src" failed.
```

See https://github.com/clutchski/coffeelint/issues/189 for more information
on this problem and suggested approach, and for a different place in Atom
where this approach is used see this:

ca39c106d6/src/config.coffee (L984)
 2015-09-23 10:06:52 -06:00
Nathan Sobo
87606c8072 Merge branch 'stable' into beta 2015-09-21 15:09:38 -06:00
Paul Betts
47f973db38 Fix incorrect indentation on setAppUserModelId 
Fixes #7374
 2015-09-21 15:08:02 -06:00
Nathan Sobo
2b0caca679 ⬆️ snippets on stable to remove stray logging 2015-09-21 15:07:04 -06:00
Nathan Sobo
d3ac862707 1.0.16 2015-09-21 15:06:18 -06:00
Max Brunsfeld
465ef7cf5f Merge branch 'stable' into beta 2015-09-21 14:00:21 -07:00
Max Brunsfeld
8b421cab28 Merge pull request #8854 from atom/mb-correct-release-target-branch 
Create draft release with correct target branch
 2015-09-18 17:30:26 -07:00
Max Brunsfeld
ff96399b72 Create draft release with correct target branch 2015-09-18 16:08:43 -07:00
Nathan Sobo
15686c25fd ⬆️ apm 
---

Re-applying this commit because it was accidentally merged from stable into
beta and master with `--strategy ours` (discard all changes) instead of
`-X ours` (discard conflicting changes).
 2015-09-18 15:55:34 -07:00
Nathan Sobo
ccfa36d1b1 Preserve all event properties when dispatching commands 
Fixes https://github.com/atom/vim-mode/issues/863
Fixes https://github.com/atom/atom/issues/8845

---

Re-applying this commit because it was accidentally merged from stable to
beta and master with `--strategy ours` (discarding the changes) instead of
`-X ours` (discarding conflicting changes).

Signed-off-by: Max Brunsfeld <maxbrunsfeld@github.com>
 2015-09-18 15:53:44 -07:00
Max Brunsfeld
ac9630cc08 Handle '-beta.x' suffixes in rpm task 2015-09-18 15:25:52 -07:00
Max Brunsfeld
ddcc2f2af0 Merge branch 'stable' into beta 2015-09-18 15:15:17 -07:00
Nathan Sobo
51ecbc0a5a 1.0.15 v1.0.15 2015-09-18 15:18:30 -06:00
Nathan Sobo
e8c7b9b3fc Merge pull request #8852 from atom/ns-mb-fix-apm-rebuild 
Hotfix: Use bundled Node when running `apm rebuild` from within Atom
 2015-09-18 15:18:11 -06:00
Nathan Sobo
781e5b4b07 ⬆️ apm 2015-09-18 14:56:42 -06:00
Nathan Sobo
69271d2ede Merge pull request #8848 from atom/ns-mb-assign-non-standard-command-event-properties 
Hotfix: Preserve all event properties when dispatching commands
v1.0.14 		2015-09-18 11:20:39 -06:00
Nathan Sobo
a8a3d4b016 1.0.14 (pre-increment) 2015-09-18 10:55:20 -06:00
Nathan Sobo
cc27ca411b Preserve all event properties when dispatching commands 
Fixes https://github.com/atom/vim-mode/issues/863
Fixes https://github.com/atom/atom/issues/8845

Signed-off-by: Max Brunsfeld <maxbrunsfeld@github.com>
 2015-09-18 10:48:30 -06:00
Nathan Sobo
ef158cd23b Merge branch 'stable' into beta 2015-09-17 17:59:35 -06:00
Nathan Sobo
e69c20f3b0 1.0.13 v1.0.13 2015-09-17 17:21:52 -06:00
Nathan Sobo
6b66bf7b0a Fix use of _atomModuleCache in getNativeModuleDependencyPaths 
Previously, we weren’t converting the relative path from the module
cache and the test wasn’t strong enough to detect this fact.
 2015-09-17 17:21:52 -06:00
Nathan Sobo
0717c1d377 Merge PR #8826 into stable 2015-09-17 16:29:03 -06:00
Max Brunsfeld
ddc20b5af3 1.1.0-beta.0 v1.1.0-beta.0 2015-09-17 10:44:40 -07:00
Max Brunsfeld
160c2cb77a 1.0.12 v1.0.12 2015-09-17 10:43:31 -07:00
Max Brunsfeld
513318924f Railcar: separate beta & stable channels by minor version 
Also, remove the '.0' suffix for the '-dev' version on master
 2015-09-17 10:39:45 -07:00
Chen Shen
20dcdf77a4 update 2015-09-17 09:52:00 -07:00
Nathan Sobo
3eddcf4c52 Merge pull request #8699 from atom/as-continuous-reflow 
Add "Continuous Reflow" mode
 2015-09-17 10:46:42 -06:00
Chen Shen
02457990f1 add ignored files 2015-09-17 09:23:09 -07:00
Chen Shen
7ea141b376 add 2015-09-17 09:09:57 -07:00
Antonio Scandurra
63a282750a 📝 Fix typo 2015-09-17 17:17:14 +02:00
Antonio Scandurra
12b926c82a 🔥 2015-09-17 17:15:51 +02:00
Antonio Scandurra
3575928cce Move continuous reflow setting into TextEditorElement 2015-09-17 17:14:00 +02:00
Antonio Scandurra
91bb8f518d Merge branch 'master' into as-continuous-reflow 2015-09-17 16:58:37 +02:00
Ivan Žužak
905ed246bf ⬆️ language-c@0.48.0 2015-09-17 16:51:01 +02:00
Antonio Scandurra
fd1c20ed2a Explicit returns on DOMElementPool 2015-09-17 12:16:24 +02:00
Antonio Scandurra
3fe34ed748 Merge pull request #8783 from atom/as-recycle-nodes 
Recycle DOM nodes
 2015-09-17 11:17:01 +02:00
Antonio Scandurra
c6948b36dc Clear pool after updating 2015-09-17 10:38:40 +02:00
Antonio Scandurra
8b52538213 Pool highlight elements 2015-09-17 10:35:20 +02:00
Ivan Žužak
0b1775a85e ⬆️ snippets@0.98.0 2015-09-17 10:06:32 +02:00
Ben Ogle
c5ffba4158 ⬆️ autocomplete-plus@2.19.1 2015-09-16 17:28:59 -07:00
Ben Ogle
65cba6bbbc ⬆️ autocomplete-css@0.11.0 2015-09-16 16:38:50 -07:00
Max Brunsfeld
ed3c5d741b Merge pull request #8815 from atom/mb-ns-fix-select-left-on-focus 
Avoid incorrect character replacement when initially typing in text-editor
 2015-09-16 14:07:26 -07:00
Max Brunsfeld
f79b3abe3f Avoid incorrect character replacement when initially typing in text-editor 
It seems that chrome now automatically selects all text in an input element
when its containing shadow root gains focus, as if it had been reached by
typing tab. Setting the input's tabindex to -1 prevents this behavior.

Signed-off-by: Nathan Sobo <nathan@github.com>
 2015-09-16 13:41:16 -07:00
Nathan Sobo
6c6f0beda5 Revert "⬆️ one-dark-ui@1.1.0 & one-light-ui@1.1.0" 
This reverts commit ecf49114fe.
 2015-09-16 14:38:22 -06:00
Nathan Sobo
46a833a608 Revert "Merge pull request #8778 from atom/mq-system-font" 
This reverts commit 457e80113e, reversing
changes made to de61aecfd1.
 2015-09-16 14:37:25 -06:00
Ivan Žužak
87b412c6e0 ⬆️ exception-reporting@0.37.0 2015-09-16 19:54:19 +02:00
Machisté N. Quintana
ecf49114fe ⬆️ one-dark-ui@1.1.0 & one-light-ui@1.1.0 2015-09-16 10:14:00 -04:00
Machisté N. Quintana
457e80113e Merge pull request #8778 from atom/mq-system-font 
Use system menu font for Atom UI
 2015-09-16 10:08:28 -04:00