Commit Graph

25142 Commits

Author SHA1 Message Date
Max Brunsfeld
0237c17bf9 Prepare 1.1.0-beta.1 2015-09-25 14:21:12 -07:00
Max Brunsfeld
ad60d7bec2 ⬆️ grunt-electron-installer 2015-09-25 13:28:09 -07:00
Max Brunsfeld
46ed413241 Merge branch 'stable' into beta 2015-09-25 13:20:01 -07:00
Max Brunsfeld
7229d1a429 Prepare 1.0.20 2015-09-25 13:19:43 -07:00
Max Brunsfeld
5f4f6d2d17 ⬆️ text-buffer v1.0.19 2015-09-25 11:19:53 -07:00
Max Brunsfeld
e8f5094e32 Look for normalized nupkg version when publishing assets 2015-09-24 17:14:24 -07:00
Max Brunsfeld
5a528ffa4e ⬆️ grunt-electron-installer (pre-release) 2015-09-24 17:14:04 -07:00
Max Brunsfeld
27c505d045 ⬆️ grunt-electron-installer (pre-release) 2015-09-24 16:37:03 -07:00
Max Brunsfeld
bcd5e0f3be ⬆️ grunt-electron-installer (pre-release) 2015-09-24 16:00:43 -07:00
Max Brunsfeld
0ad9701ef5 Merge branch 'stable' into beta 2015-09-24 14:38:47 -07:00
Max Brunsfeld
c444923935 Prepare 1.0.19 2015-09-24 14:38:14 -07:00
Max Brunsfeld
911be22b8b Merge pull request #8933 from atom/mb-fix-text-buffer-load-serialization
Upgrade text-buffer to fix serialization incompatibility
v1.0.18
2015-09-24 14:09:25 -07:00
Max Brunsfeld
9a8989d707 ⬆️ text-buffer 2015-09-24 13:46:29 -07:00
Max Brunsfeld
cd527b8cff Merge branch 'stable' into beta 2015-09-24 12:16:05 -07:00
Max Brunsfeld
235d6f7ff8 Prepare 1.0.18 2015-09-24 12:15:25 -07:00
Max Brunsfeld
c3d75bea92 Prepare 1.0.17 v1.0.17 2015-09-24 11:37:40 -07:00
Kevin Sawicki
d29ff7556c Merge branch 'stable' into beta 2015-09-24 09:05:46 -07:00
Kevin Sawicki
c2b7924830 Merge pull request #8927 from atom/ks-electron-upgrade
Upgrade to Electron 0.30.7
2015-09-24 08:57:32 -07:00
Kevin Sawicki
b06e5a7bcb ⬆️ electron@0.30.7 2015-09-24 08:07:19 -07:00
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