github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-27 07:47:58 -05:00
Code Issues Packages Projects Releases Wiki Activity
29,265 Commits 140 Branches 571 Tags
0240206d93e4efbb0fcc87792a07ec66703d021e
Commit Graph

29265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan Sobo
0240206d93 Merge branch 'master' into brumm-master 2016-08-02 15:39:57 -06:00
Max Brunsfeld
c7b7eace22 Merge pull request #12292 from atom/mb-fix-incompatible-module-error 
Fix exception when package requires an incompatible native module
 2016-08-02 13:58:28 -07:00
Max Brunsfeld
1a35e6e22f Merge pull request #12278 from atom/mb-js-api-docs 
Allow JavaScript classes to be included in API documentation
 2016-08-02 12:59:15 -07:00
Max Brunsfeld
9a72c7e65e Fix exception when package requires an incompatible native module 2016-08-02 12:14:00 -07:00
Nathan Sobo
a7c38ea732 Merge pull request #12289 from atom/ns-as-fix-tokenized-buffer-iterator 
Always seek to specified position in TokenizedBufferIterator
 2016-08-02 12:46:30 -06:00
Nathan Sobo
2b5f1bda46 Always seek to specified position in TokenizedBufferIterator 
Fixes #10350

Signed-off-by: Antonio Scandurra <as-cii@github.com>
 2016-08-02 12:19:45 -06:00
Max Brunsfeld
ebcffb1c8b Run joanna with an explicit list of paths 2016-08-02 11:18:11 -07:00
Damien Guard
ed5ad3cee7 Merge branch '1.10-releases' 2016-08-02 06:39:13 -07:00
Max Brunsfeld
b358047b96 Convert DeserializerManager to JS 2016-08-01 17:03:06 -07:00
Max Brunsfeld
2e04bd6ea9 Convert window.coffee and clipboard.coffee to javascript 2016-08-01 17:03:06 -07:00
Max Brunsfeld
61bbfae420 ⬆️ joanna 2016-08-01 17:03:06 -07:00
Max Brunsfeld
2500d59bce Generate API docs from js sources 2016-08-01 17:03:06 -07:00
Max Brunsfeld
3fd275a7f6 Convert Color to JS 2016-08-01 17:03:06 -07:00
Nathan Sobo
475ad6b4e6 ⬆️ about 2016-08-01 16:14:20 -06:00
simurai
ec3207e6c0 ⬆️ settings-view@v0.241.1 
https://github.com/atom/settings-view/pull/822
 2016-07-31 14:26:13 +02:00
Damien Guard
f3caa67109 Ensure beta is detected from path v1.10.0-beta0 2016-07-29 15:51:45 -07:00
Damien Guard
82efce08ed Fix WinShell closure/for issue, improve error handling 2016-07-29 14:48:33 -07:00
Nathan Sobo
acc5052978 ⬆️ text-buffer 2016-07-29 15:12:01 -06:00
Nathan Sobo
1fd51ee271 ⬆️ text-buffer 2016-07-29 15:11:37 -06:00
Antonio Scandurra
08d121533e Merge pull request #12262 from atom/as-delete-obsolete-code 
Delete Obsolete Code
 2016-07-29 17:43:56 +02:00
Nathan Sobo
aedc0d1c16 Merge pull request #12258 from atom/mq-js-styleguide 
Add JS style guide to the Contributing guide
 2016-07-29 09:15:36 -06:00
Antonio Scandurra
6d4102a098 Delete random-editor-spec.coffee 
We are already extensively testing the same specs on text-buffer.
 2016-07-29 17:15:06 +02:00
Antonio Scandurra
fd94acc2e8 Delete RowMap and its specs 
After transitioning to `DisplayLayer` we don't need this object anymore.
 2016-07-29 17:12:44 +02:00
Machiste Quintana
45b93e6df8 📝 Add JS style guide to the Contributing guide 2016-07-28 19:53:36 -07:00
Nathan Sobo
002c776f10 Fix regex to allow multi-digit minor versions in build script 
Signed-off-by: Antonio Scandurra <as-cii@github.com>
 2016-07-28 15:34:57 -06:00
Nathan Sobo
e249b26a38 Fix regex to allow multi-digit minor versions in build script 
Signed-off-by: Antonio Scandurra <as-cii@github.com>
 2016-07-28 15:34:38 -06:00
Hubot
ebd68515d2 1.10.0-beta0 2016-07-28 13:29:20 -05:00
Hubot
e0cc48f17e 1.11.0-dev 2016-07-28 13:29:20 -05:00
Damien Guard
0aa4256bcf ⬆️ settings-view@0.241.0 2016-07-28 10:16:37 -07:00
Nathan Sobo
c00af22c88 Merge pull request #12249 from atom/ns-as-fix-spacebar-regression 
Fix regression where spacebar scrolled elements containing editors
 2016-07-27 17:29:02 -06:00
Nathan Sobo
7c79a5b973 Fix regression where spacebar scrolled elements containing editors 
/cc @hellendag
 2016-07-27 14:58:11 -06:00
Nathan Sobo
67046ff2d9 ⬆️ tree-view to address flaky specs (hopefully) 2016-07-27 14:46:41 -06:00
Antonio Scandurra
e5da1011d4 ⬆️ 💚 language-html 
Signed-off-by: Nathan Sobo <nathan@github.com>
 2016-07-27 20:01:52 +02:00
Nathan Sobo
8e3086ab46 Merge pull request #12246 from atom/as-electron-compatibility 
Make Atom executable as a standard Electron app
 2016-07-27 10:54:28 -06:00
Antonio Scandurra
9ad9a96b34 Copy comments 2016-07-27 15:09:08 +02:00
Antonio Scandurra
ccccafd4ea 🎨 2016-07-27 15:01:50 +02:00
Antonio Scandurra
4fc049461c var -> const 2016-07-27 14:59:24 +02:00
Antonio Scandurra
e4946a1892 Make Atom executable as a standard Electron app 2016-07-27 14:58:23 +02:00
Antonio Scandurra
921ff85167 Remove trailing semicolon 2016-07-27 11:59:48 +02:00
Antonio Scandurra
9bdc88ad32 Export ATOM_RESOURCE_PATH in Gruntfile.coffee if unset 2016-07-27 11:51:57 +02:00
Antonio Scandurra
94b4ec4ccb 💚 Add missing require statement 2016-07-27 11:06:35 +02:00
Antonio Scandurra
1d2f9cfeef Make sure script/grunt exports ATOM_RESOURCE_PATH 2016-07-27 11:02:41 +02:00
Antonio Scandurra
8b259a9f9f Put back Travis badge for Linux build status 2016-07-27 10:29:37 +02:00
Antonio Scandurra
98b792504f Merge pull request #12232 from atom/as-ns-remove-osx-from-travis 
Remove OS X from Travis Build Matrix
 2016-07-27 10:27:20 +02:00
Nathan Sobo
e8f1591c92 Merge pull request #12240 from atom/revert-12233-revert-11897-mkt-use-apm-with-npm3-and-node-4 
Revert "Revert "Use apm@1.12.2 with Node v4 and npm v3 \o/""
 2016-07-26 11:10:43 -06:00
Nathan Sobo
ea8ca2f17f ⬆️ atom-package-manager to fix asar-require issues 2016-07-26 11:09:35 -06:00
Nathan Sobo
beeeaeb521 Revert "Revert "Use apm@1.12.2 with Node v4 and npm v3 \o/"" 2016-07-26 10:29:25 -06:00
Damien Guard
8550fe028b New crashreporter URL to prevent warnings 2016-07-26 09:10:43 -07:00
Nathan Sobo
986689b0e4 Merge pull request #12233 from atom/revert-11897-mkt-use-apm-with-npm3-and-node-4 
Revert "Use apm@1.12.2 with Node v4 and npm v3 \o/"
 2016-07-25 16:22:50 -06:00
Nathan Sobo
f19e043f5c Revert "Use apm@1.12.2 with Node v4 and npm v3 \o/" 2016-07-25 16:22:22 -06:00