Commit Graph

27464 Commits

Author SHA1 Message Date
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
Max Brunsfeld
9db33e5f8e ⬆️ autocomplete-plus 2016-01-26 11:42:12 -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
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
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
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
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
Lee Dohm
f826d38d0b Merge pull request #10068 from atom/ld-linkify-promise-docs
📝 Linkify all docs mentions of Promises
2016-01-18 00:23:52 -08:00
Josh Abernathy
032a734325 A better description of why we're forcing 32-bit. 2016-01-17 15:47:18 -05:00
Josh Abernathy
e87c90449e Revert "Always set the architecture to ia32 on Windows."
This reverts commit 5c77effc20.
2016-01-17 15:45:30 -05:00
Josh Abernathy
44894203e7 Force 32-bit binaries from node-pre-gyp. 2016-01-17 00:07:50 -05:00
Machisté N. Quintana
0893201e3c Merge pull request #10452 from pra85/patch-1
Update license year to 2016
2016-01-16 08:46:39 -05:00
Prayag Verma
5a2c8ff962 Update license year to 2016 2016-01-16 13:21:11 +05:30
joshaber
7ab501ce9d Disable the test for now. 2016-01-15 17:42:48 -05:00
joshaber
1fb1376769 Even more async. 2016-01-15 17:40:14 -05:00
joshaber
e5aebcb351 Revert "Wait a tick before checking for path subscriptions?"
This reverts commit d9cf7a73c6.
2016-01-15 17:36:22 -05:00
case
59b8846667 Remove Accidental Semicolons 2016-01-15 16:22:08 -06:00
Wliu
271f6b184d ⬆️ electron@0.36.4 2016-01-15 17:21:11 -05:00
Wliu
7ee74ed4c7 Merge branch 'master' into wl-electron-35 2016-01-15 17:20:31 -05:00
Katrina Uychaco
7b69ed7b4f ⬆️ tabs@0.90.0 2016-01-15 14:06:15 -08:00
joshaber
d9cf7a73c6 Wait a tick before checking for path subscriptions? 2016-01-15 17:02:18 -05:00
joshaber
0332c8aab3 Enable thread safety. 2016-01-15 16:33:20 -05:00
joshaber
80a8f83f04 ⬆️ nodegit@0.8 2016-01-15 16:32:02 -05:00