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
29,265 Commits 140 Branches 571 Tags
16c80f6eaf3d5b0f1614b2b8259d42dc1fefc6cf
Commit Graph

29265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Max Brunsfeld
16c80f6eaf WIP - add local null grammar 2016-07-28 14:47:26 -07:00
Max Brunsfeld
f1a302a139 Merge branch 'master' into ns-mb-detangle-editor 2016-07-28 10:33:23 -07:00
Damien Guard
0aa4256bcf ⬆️ settings-view@0.241.0 2016-07-28 10:16:37 -07:00
Max Brunsfeld
f48165deaf 🔥 Unused workspace parameter in TextEditorComponent 2016-07-28 10:07:53 -07:00
Max Brunsfeld
36ecbd4ca4 🔥 Unused grammar registry parameter in TextEditorComponent 2016-07-28 10:06:42 -07:00
Max Brunsfeld
738a2b90dc 🔥 useShadowDOM setting 2016-07-28 10:02:16 -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
Max Brunsfeld
e1f8a72995 Move ctrl-mousewheel handling out of TextEditorComponent 
Signed-off-by: Nathan Sobo <nathan@github.com>
 2016-07-27 16:02:24 -07:00
Max Brunsfeld
ab30ecf994 Manage scroll sensitivity setting in TextEditorRegistry 
Signed-off-by: Nathan Sobo <nathan@github.com>
 2016-07-27 15:39:03 -07:00
Max Brunsfeld
63a730253b Don't use config for scrollSensitivity in TextEditorComponent 
Signed-off-by: Nathan Sobo <nathan@github.com>
 2016-07-27 15:35:56 -07:00
Max Brunsfeld
4c03cb39de 🔥 Unused method 
Signed-off-by: Nathan Sobo <nathan@github.com>
 2016-07-27 15:35:53 -07:00
Max Brunsfeld
1c38dce3b2 Don't use font config settings in TextEditorComponent 
Signed-off-by: Nathan Sobo <nathan@github.com>
 2016-07-27 15:23:59 -07:00
Max Brunsfeld
3f8b6138dc Don't use config in TextEditorPresenter 
Signed-off-by: Nathan Sobo <nathan@github.com>
 2016-07-27 14:56:36 -07:00
Max Brunsfeld
3d796df401 Stop using GrammarRegistry in TextEditor 2016-07-27 14:09:17 -07: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
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
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
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