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,368 Commits 140 Branches 571 Tags
e6e4ec285a4b8bf6a46338100b0a2182db7fa51f
Commit Graph

25368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Max Brunsfeld
e6e4ec285a Merge branch 'beta' 2015-09-24 12:16:25 -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
Max Brunsfeld
7a0fa8ecdc Merge pull request #8897 from ssorallen/lowercase-optional 
Use lowercase 'optional' keyword used by docs
 2015-09-24 11:26:07 -07:00
Kevin Sawicki
238f5a9622 Clean root electron directory 2015-09-24 10:30:10 -07:00
Kevin Sawicki
acc9b463df Merge branch 'beta' 2015-09-24 09:11:00 -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
Ivan Žužak
f20c73aa9b ⬆️ settings-view@0.222.0 2015-09-24 15:06:36 +02:00
Antonio Scandurra
a137e50857 Merge pull request #8895 from atom/as-undefined-offset-height 
Allow null TextEditorComponent::domNode during visibility check
 2015-09-24 10:33:44 +02:00
simurai
9daefc7395 ⬆️ one-dark/light-syntax@v1.1.1 2015-09-24 16:11:14 +09:00
Cheng Zhao
c148df11c9 Merge pull request #8900 from atom/cz-update-native-modules 
Update all native modules and their dependents to Nan 2
 2015-09-24 13:45:44 +08:00
Max Brunsfeld
a97029c3d2 Merge pull request #8721 from scv119/autoupdate 
Add --no-auto-update while run `scripts/build` to disable autoupdate
 2015-09-23 17:31:52 -07:00
Nathan Sobo
af83249d4e Merge branch 'stable' into beta 2015-09-23 16:59:50 -06:00
Max Brunsfeld
2a1c9f0cf3 Merge branch 'master' into cz-update-native-modules 
Conflicts:
	package.json
 2015-09-23 12:48:12 -07:00
Max Brunsfeld
bb2bd5492f Merge branch 'master' into cz-update-native-modules 
Conflicts:
	package.json
 2015-09-23 12:46:08 -07:00
Nathan Sobo
de2bce4f1d More helpful hints 2015-09-23 13:07:31 -06:00
Antonio Scandurra
4ffeb68403 Ensure domNode is not set arbitrarily to null 2015-09-23 19:01:57 +02:00
Nathan Sobo
0a67cb9729 Merge pull request #8682 from atom/tj-remove-deprecations 
Remove deprecated code
 2015-09-23 10:41:26 -06:00
Nathan Sobo
50ce1c4afc Guard against undefined state in Workspace.deserialize 2015-09-23 10:16:59 -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
simurai
e1fb376a08 ⬆️ one-dark/light-ui@v1.1.4 2015-09-23 16:04:47 +09:00
simurai
8a58e85670 ⬆️ markdown-preview@v0.154.0 2015-09-23 16:03:37 +09:00
Cheng Zhao
39d7f0bc73 ⬆️ spell-check@0.60.0 2015-09-23 09:37:57 +08:00
Cheng Zhao
0afdb84f71 ⬆️ tree-view@0.189.0 2015-09-23 09:37:22 +08:00
Cheng Zhao
522c63c68b ⬆️ symbols-view@0.108.0 2015-09-23 09:37:17 +08:00
Cheng Zhao
99e85e70ce ⬆️ markdown-preview@0.153.0 2015-09-23 09:37:09 +08:00
Cheng Zhao
6b40a9c574 ⬆️ link@0.31.0 2015-09-23 09:37:03 +08:00
Cheng Zhao
ae84cf4950 ⬆️ apm@1.1.1 2015-09-23 09:34:03 +08:00
Cheng Zhao
c4516b69c9 ⬆️ scandal@2.2 2015-09-23 09:32:55 +08:00
Cheng Zhao
4d2c1b14c4 ⬆️ text-buffer@7.1.0 2015-09-23 09:31:50 +08:00
Cheng Zhao
2b36746ac8 ⬆️ scrollbar-style@3.2 2015-09-23 09:31:08 +08:00
Cheng Zhao
0a24384121 ⬆️ git-utils@4 2015-09-23 09:31:06 +08:00
Cheng Zhao
9c90cd0bdf ⬆️ oniguruma@5 2015-09-23 09:24:19 +08:00
Cheng Zhao
f0f4b83153 ⬆️ nslog@3 2015-09-23 09:24:06 +08:00
Cheng Zhao
d88b8a2104 ⬆️ pathwatcher@6.2 2015-09-23 09:23:31 +08:00
Cheng Zhao
4e73bd3729 ⬆️ atom-keymap@6.0.0 2015-09-23 09:20:22 +08:00
Cheng Zhao
9b08976958 ⬆️ runas@3.1 2015-09-23 09:19:01 +08:00
Ross Allen
59ba793d64 Use lowercase 'optional' keyword used by docs 
The docs generator expects 'optional' starting with a lowercase 'o' to
mark arguments as optional. Lowercase 'O' to properly generate the docs.
 2015-09-22 14:10:05 -07:00
Antonio Scandurra
620e87420b Allow null TextEditorComponent::domNode during visibility check 
* Use `atom.assert` to verify that the ctor was run before the exception.
 2015-09-22 21:18:55 +02:00
Chen Shen
1900f766e7 Add --no-autoupdate while run scripts/build to disable autoupdate 2015-09-22 11:34:08 -07:00
Nathan Sobo
ed6fe6a82b Remove testSerialization call 2015-09-22 11:57:12 -06:00
Nathan Sobo
0145ae3436 Merge pull request #8892 from atom/ns-throw-when-adding-destroyed-pane-items 
Throw exception when adding a pane item that has already been destroyed
 2015-09-22 10:57:57 -06:00
Nathan Sobo
e443957c3b Remove serializable dependency 2015-09-22 10:55:59 -06:00
Nathan Sobo
3d4ed37f81 Don’t use Serializable mixin in Workspace 2015-09-22 10:55:52 -06:00
Nathan Sobo
d997c80d31 Don’t use Serializable mixin in Project 2015-09-22 10:50:11 -06:00
Nathan Sobo
17b4725b44 Don’t use Serializable mixin in PaneContainer 2015-09-22 10:46:30 -06:00