github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-07 21:25:05 -05:00
Code Issues Packages Projects Releases Wiki Activity
28,423 Commits 140 Branches 571 Tags
afdd8d2b6dce2de309ceafb02dfd5dc20c4f89fb
Commit Graph

28423 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Ogle
8acb742c30 Merge pull request #7916 from oggy/descriptive-enums 
Support descriptions for enum values in config.
 2016-01-26 14:45:00 -08:00
Wliu
d1b5e0e7e3 ⬇️ electron@0.36.4 
Resolves crashes on Windows
 2016-01-26 17:23:30 -05:00
Max Brunsfeld
f4be23049d Wait for window resize to take effect in text editor component spec 2016-01-26 13:26:12 -08:00
Machisté N. Quintana
c91338ab7a Merge pull request #10595 from atom/mq-doc-install-prereqs 
Document installation prerequisites in Readme
 2016-01-26 14:57:15 -05:00
Max Brunsfeld
9db33e5f8e ⬆️ autocomplete-plus 2016-01-26 11:42:12 -08:00
Nathan Sobo
47338253db Adapt to new text-buffer API 2016-01-26 12:38:35 -07:00
Machisté N. Quintana
b621e659cf 📝 Document installation prerequisites in Readme 
Just Git for now.

Closes https://github.com/atom/atom/pull/10390
Closes https://github.com/atom/atom/issues/10388
 2016-01-26 14:38:24 -05:00
Ben Ogle
077f7b2b32 Merge pull request #9260 from fazlearefin/master 
Updated README: Fedora 22 dnf install requires pathname of package
 2016-01-26 10:57:09 -08:00
Ben Ogle
65e19b7a88 Merge pull request #10226 from danielbayley/master 
Update deprecated-packages.json
 2016-01-25 18:18:49 -08:00
Max Brunsfeld
18a1f06022 Merge pull request #10581 from atom/mb-fix-legacy-config-api 
Require package's main module in legacy activateConfig method
 2016-01-25 15:28:50 -08:00
Wliu
2d0b87b49d Merge branch 'wl-electron-35' of github.com:atom/atom into wl-electron-35 2016-01-25 16:39:16 -05:00
Wliu
be85af4bc5 ⬆️ electron@0.36.5 2016-01-25 16:39:07 -05:00
Wliu
3f471cd94f Merge remote-tracking branch 'refs/remotes/origin/master' into wl-electron-35 2016-01-25 16:33:50 -05:00
Max Brunsfeld
d055a686ae Merge pull request #10486 from atom/bf-fix-submenu-items 
Honor `created()` function for an item in a submenu.
 2016-01-25 13:31:25 -08:00
Michael Bolin
83d3168609 Rename test function as suggested by @maxbrunsfeld. 2016-01-25 13:19:58 -08:00
Max Brunsfeld
dc903fa124 Require package's main module in legacy activateConfig method 2016-01-25 12:42:12 -08:00
Max Brunsfeld
b6fdbf4dc3 Prepare 1.5.0-beta1 v1.5.0-beta1 2016-01-25 10:29:46 -08:00
Max Brunsfeld
c4adc38273 Merge branch 'stable' into beta 2016-01-25 10:29:29 -08:00
Max Brunsfeld
2cf2ccbc04 Prepare 1.4.1 v1.4.1 2016-01-25 09:41:07 -08:00
Max Brunsfeld
dc413b8cd8 ⬆️ text-buffer 2016-01-25 09:35:27 -08:00
Wliu
62c1f6a181 ⬆️ language-gfm@0.84.0 2016-01-23 22:11:40 -05:00
Josh Abernathy
f914d1870e Merge pull request #10549 from atom/bump-nodegit 
⬆️ nodegit@0.9.0
 2016-01-23 14:49:32 -05:00
Dirk Thomas
13f0987ede improve docs about grouped settings 
See https://github.com/atom/settings-view/pull/698#issuecomment-171725215
 2016-01-22 19:46:51 -08:00
joshaber
191e607bd6 Merge branch 'stable' 2016-01-22 17:01:03 -07:00
joshaber
1cb7466d68 ⬆️ nodegit@0.9.0 2016-01-22 12:08:00 -07:00
Josh Abernathy
91eb2b2a28 Merge pull request #10293 from atom/as-more-flexible-inputs-for-blob-store 
Ignore errors when loading an invalid blob store
 2016-01-22 11:44:29 -07:00
Wliu
1cc62bf932 ⬆️ language-php@0.37.0 2016-01-21 20:32:33 -05:00
Michael Bolin
ee4408976e Tightened up a test now that I confirmed that MenuHelpers.merge() intentionally strips the created field. 2016-01-21 10:18:04 -08:00
Josh Abernathy
a1dcdfa2ca Merge pull request #10523 from atom/babelify-js 
Babelify the app source too.
 2016-01-20 17:05:32 -07:00
joshaber
ce709d145b Babelify the app source too. 
Fixes #10509.
 2016-01-20 14:43:21 -07:00
Wliu
08e796500d Merge pull request #10441 from casesandberg/bug/cleanup-specs 
Remove Duplicate Require Statements and Unify Syntax on '
 2016-01-20 15:25:36 -05:00
Joe Fitzgerald
3a14fa2a2e Use ELECTRON_RUN_AS_NODE Variable Key 
- https://github.com/atom/electron/pull/3594
 2016-01-19 17:41:33 -08:00
Josh Abernathy
1be4453c53 Merge pull request #10507 from atom/handle-broken-submodules 
Handle broken submodules
 2016-01-19 17:38:25 -07:00
joshaber
60c33f6bc9 Open submodules directly instead of searching. 2016-01-19 16:35:36 -07:00
joshaber
50c74499dc Link to the libgit2 issue. 2016-01-19 16:34:30 -07:00
Wliu
996c753217 Merge remote-tracking branch 'refs/remotes/origin/master' into wl-electron-35 2016-01-19 18:25:37 -05:00
Nathan Sobo
21b1f79fab Avoid updating screen lines in DisplayBuffer 2016-01-19 14:51:24 -07:00
Nathan Sobo
ed79413de1 Depend on DisplayLayer for more things 2016-01-19 14:39:37 -07:00
Michael Bolin
9423ec8b3a Renamed local variables as recommended by @ssorallen. 2016-01-19 12:37:38 -08:00
joshaber
514842ca77 If we can't refresh a submodule, drop it. 2016-01-19 11:59:16 -05:00
Wliu
a797c9b9f8 ⬆️ language-javascript@0.106.0 2016-01-19 09:53:07 -05:00
Josh Abernathy
ab02a7b5a9 Merge pull request #10445 from atom/update-nodegit 
Update nodegit
 2016-01-19 08:34:35 -05:00
Josh Abernathy
48eb5ab774 Merge pull request #10468 from atom/fix-64-bit-windows 
Fix 64-bit Windows builds
 2016-01-18 22:20:58 -05:00
Michael Bolin
0e4a8303ae Apparently the created function is stripped as part of the clone? 2016-01-18 18:32:37 -08:00
Michael Bolin
0a4817693f Add unit test. Cannot seem to run locally because of nodegit but will see what happens in CI. 2016-01-18 16:50:16 -08:00
Michael Bolin
3d5386e514 Honor created() function for an item in a submenu. 
Fixes #10483.
 2016-01-18 16:39:19 -08:00
Michael Bolin
04b100fab8 Revert "Honor created() function for an item in a submenu." 
This reverts commit 9917ed39aa.

Sorry, apparently I don't know how to use Git anymore.
I'm just trying to put this up for review and it went straight
to master instead.
 2016-01-18 16:36:49 -08:00
Michael Bolin
9917ed39aa Honor created() function for an item in a submenu. 
Fixes #10483.
 2016-01-18 16:34:36 -08:00
Michael Bolin
f8d20760af Revert "Honor created() function for an item in a submenu." 
This reverts commit 962308509b.
 2016-01-18 16:33:35 -08:00
Michael Bolin
962308509b Honor created() function for an item in a submenu. 
Fixes #10483.
 2016-01-18 16:32:16 -08:00