github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-15 00:55:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
31,553 Commits 140 Branches 571 Tags
2d3b7e82bd0bc2a3dcb7d05d217cfd3ffc5fc99e
Commit Graph

31553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Max Brunsfeld
e6c83521c9 Move grammar serialization logic to TextEditorRegistry 2016-07-27 13:10:23 -07:00
Max Brunsfeld
e35c761246 Use setShowInvisibles in TextEditorPresenter spec 2016-07-27 11:23:39 -07:00
Antonio Scandurra
e5da1011d4 ⬆️ 💚 language-html 
Signed-off-by: Nathan Sobo <nathan@github.com>
 2016-07-27 20:01:52 +02:00
Max Brunsfeld
8bf60f9266 Don't call PackageManager::activate in workspace spec 2016-07-27 10:59:50 -07:00
Max Brunsfeld
1ab26c7e85 Pass TextEditorRegistry to Workspace constructor in spec 2016-07-27 10:39:59 -07: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
2232f61c97 Inline computeDestinationPath into copyAssets 
...as we don't need that function to be reusable anymore. We can always extract it later if needed.
 2016-07-27 16:58:30 +02:00
Antonio Scandurra
59d995b21d Transpile CSON 2016-07-27 16:53:38 +02:00
Antonio Scandurra
ee60a2daaa 🎨 2016-07-27 16:53:27 +02:00
Antonio Scandurra
6903e941d9 Use path.join instead of manually creating paths 2016-07-27 16:39:53 +02:00
Antonio Scandurra
c4c12c2e1d Transpile package sources 2016-07-27 16:17:52 +02:00
Antonio Scandurra
d4795ab562 Transpile assets in-place 2016-07-27 16:09:49 +02:00
Antonio Scandurra
7ca4145eb9 Merge branch 'master' into ns-modernize-build 2016-07-27 15:18:10 +02: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
Max Brunsfeld
dfb48aa8da Get TextEditorComponent specs passing 
Signed-off-by: Nathan Sobo <nathan@github.com>
 2016-07-26 16:04:09 -07:00
Max Brunsfeld
caab1dda63 Move grammar-used spec to workspace-spec 
Signed-off-by: Nathan Sobo <nathan@github.com>
 2016-07-26 15:38:53 -07:00
Max Brunsfeld
d203610986 Set grammar manually in tokenized buffer specs 
Signed-off-by: Nathan Sobo <nathan@github.com>
 2016-07-26 15:08:59 -07:00
Max Brunsfeld
a44d5833a8 Move grammar override logic into TextEditorRegistry 
Signed-off-by: Nathan Sobo <nathan@github.com>
 2016-07-26 15:00:20 -07:00
Max Brunsfeld
455d3213ed Return token objects from tokensForScreenRow 
Include the text of each token alongside its array of scopes.

Signed-off-by: Nathan Sobo <nathan@github.com>
 2016-07-26 12:39:41 -07:00
Max Brunsfeld
20b54505f3 Move logic for assigning grammars to editors into TextEditorRegistry 2016-07-26 10:50:57 -07: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
Antonio Scandurra
59bc5d427e Copy static/, dot-atom/ and vendor/ as they are 2016-07-26 14:52:14 +02:00
Antonio Scandurra
265cb90a6d Clean output directory before building 2016-07-26 14:51:51 +02:00
Antonio Scandurra
e6ae7d836d Inline transpile call 2016-07-26 14:51:07 +02:00
Andres Suarez
d7378f0d6a Cleanup activationHookSubscriptions when deactivating package 
Released under CC0.
 2016-07-25 22:45: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
Damien Guard
7e006cde87 Merge pull request #12230 from atom/dg-do-not-autosubmit-crash-reporter 
Disable autosubmit of crash reporter
 2016-07-25 11:37:56 -07:00
Max Brunsfeld
920f62a76a Merge pull request #11216 from ypresto/speedup-config-setdefaults 
🐎 wrap loop of config.setDefaults() in transact()
 2016-07-25 10:29:35 -07:00
Max Brunsfeld
397a672d69 Merge pull request #12226 from ypresto/transact-set-schema 
Speedup Packages view loading time
 2016-07-25 10:01:09 -07:00
Antonio Scandurra
ca09bdf195 Remove OS X from Travis Build Matrix 
Signed-off-by: Nathan Sobo <nathan@github.com>
 2016-07-25 19:00:47 +02:00
Nathan Sobo
718fa989de Merge pull request #12207 from atom/as-circle-ci 
Introduce CircleCI for macOS builds
 2016-07-25 10:35:12 -06:00
Antonio Scandurra
64c5924b3f Replace Travis status badge with CircleCI 
Signed-off-by: Nathan Sobo <nathan@github.com>
 2016-07-25 10:33:32 -06:00
Antonio Scandurra
5a4be54b56 Zip before collecting artifact 2016-07-25 10:33:32 -06:00
Antonio Scandurra
919be72ce7 Make Atom.app downloadable from the artifacts 2016-07-25 10:33:32 -06:00
Antonio Scandurra
a06ff650ee Build all the branches 2016-07-25 10:33:31 -06:00