Commit graph

7667 commits

Author SHA1 Message Date
Cheng Zhao
44260634af Merge pull request #4364 from atom/launch-url-or-file-directly-from-cli
Launch URL or HTML file directly
2016-02-16 16:13:10 +08:00
Cheng Zhao
7ca09de386 Merge remote-tracking branch 'origin/dont-write-empty-dev-tools-extensions-file' 2016-02-16 12:30:42 +08:00
Cheng Zhao
55642d257d Merge pull request #4494 from pra85/patch-3
docs: fix a minor typo
2016-02-16 12:28:08 +08:00
Plusb Preco
81ffde3c2a 📝 Update as upstream
[ci skip]
2016-02-16 12:20:21 +08:00
Cheng Zhao
95d8716ffa Merge pull request #4497 from atom/docs-revise
Improve the IPC related docs
2016-02-16 12:20:00 +08:00
Cheng Zhao
fded8d80b1 docs: Remove unnecessary "properties: " suffix 2016-02-16 12:11:05 +08:00
Cheng Zhao
2b406ccaf7 Optional => optional 2016-02-16 11:54:41 +08:00
Cheng Zhao
f58bab70c5 docs: Improve the docs on sharing data 2016-02-16 11:52:47 +08:00
Cheng Zhao
b8e8e4c930 docs: Cleanup the IPC docs 2016-02-16 11:34:39 +08:00
cesine
2aff0c47d0 ⬆️ 👕 updated to eslint 2.1.0
Verified migration doc (nothing to be done)
http://eslint.org/docs/user-guide/migrating-to-2.0.0

And made sure the eslint tasks passed
2016-02-15 22:30:29 -05:00
Cheng Zhao
63578f9d2b Merge pull request #4392 from madarche/doc-howto-share-objects
Document different techniques to share objects
2016-02-16 11:18:20 +08:00
Cheng Zhao
40a0a6aa8e Merge pull request #4495 from atom/frame-subscriber
Use weak pointer instead of manual bookkeeping
2016-02-16 11:13:11 +08:00
Cheng Zhao
d035fc2816 Merge pull request #4453 from lukeapage/patch-6
Docs - clarify ipc arguments
2016-02-16 11:08:35 +08:00
Cheng Zhao
3c4043fd39 spec: Skip autoUpdater tests in MAS build 2016-02-16 11:00:36 +08:00
Cheng Zhao
66bb6a8534 Use weak pointer instead of manual bookkeeping 2016-02-16 10:44:10 +08:00
Cheng Zhao
ed1966ac76 spec: Bring back beginFrameSubscription test 2016-02-16 10:30:18 +08:00
Prayag Verma
367a3524b9 docs: fix a minor typo
Remove extra `will`
2016-02-16 07:51:14 +05:30
Cheng Zhao
1232a285e6 Merge pull request #4451 from MaxWhere/framesubscriber-fix
Fixing FrameSubscriber memory issue
2016-02-16 10:20:44 +08:00
Cheng Zhao
f3f6fa958e Merge pull request #4449 from deepak1556/permission_helper_media_patch
browser: handle desktop capture devices in media permission request
2016-02-15 23:12:57 +08:00
Cheng Zhao
08e5c1f6fe Merge branch 'webcontent_invalid_loadurl_patch' of https://github.com/deepak1556/atom-shell into deepak1556-webcontent_invalid_loadurl_patch 2016-02-15 21:14:54 +08:00
Cheng Zhao
e244d0db0c Merge pull request #4421 from atom/dialog-icon-on-mac
Support configurable dialog icon on Mac
2016-02-15 16:48:43 +07:00
Cheng Zhao
7c7e6ffc77 Fix broken links in desktop-environment-integration.md
Close #4404.
2016-02-15 16:36:01 +08:00
Cheng Zhao
18f31d7db9 Merge pull request #4398 from LartSimZ/master
Fix for issue #4369
2016-02-15 15:30:06 +07:00
Luke Page
a141d6b3d4 spelling fixes and americanisms 2016-02-15 06:51:20 +01:00
Luke Page
2c6e5d0464 Clarify arguments sent via ipc 2016-02-15 06:29:52 +01:00
Jacob Page
17603d5dfb makeSingleInstance clarification
Removed callback return value from the sample code for makeSingleInstance because it appears to not be used for anything.
2016-02-14 19:13:11 -08:00
Cheng Zhao
09b658b50a Merge pull request #4361 from ShiningRay/patch-2
translate remote.md into Chinese
2016-02-15 09:13:02 +07:00
Plusb Preco
f63d8b4d5e 📝 Update as upstream
[ci skip]
2016-02-15 10:05:29 +08:00
Remi Sezille
ef290ffcf2 Add styleguide in french
[ci skip]
2016-02-13 19:28:12 +01:00
Remi Sezille
efd25efaf4 Add FAQ
[ci skip]
2016-02-13 18:20:34 +01:00
Remi Sezille
a69341f551 Fix line length wrap
[ci skip]
2016-02-13 18:19:49 +01:00
Remi Sezille
940c325e7f Add french docs link on main README
[ci skip]
2016-02-13 11:32:47 +01:00
Remi Sezille
adf89a1e0e Translate README in french
[ci skip]
2016-02-13 11:29:08 +01:00
Yuya Ochiai
d76f6fe8e0 📝🏁 Add icon overlays in taskbar to docs
[ci skip]
2016-02-13 17:34:12 +09:00
Kevin Sawicki
440eccb7ee Merge pull request #4455 from preco21/patch-5
Remove unnecessary line feeds
2016-02-12 09:38:27 -08:00
Plusb Preco
e71eeda73c Remove unnecessary line feeds
[ci skip]
2016-02-12 22:38:08 +09:00
Marc-Aurèle DARCHE
2677dc6844 Fix: add missing fragment in FAQ section URL 2016-02-12 13:50:15 +01:00
Heilig Benedek
f36e2841bf Don't fire callbacks after we end the subscription 2016-02-12 13:30:11 +01:00
Heilig Benedek
91c96559fa Fixing the problem related to FrameSubscriber 2016-02-12 02:18:13 +01:00
Kevin Sawicki
03dd94d2b2 Merge pull request #4450 from HR/patch-1
Fix electron binary relative path
2016-02-11 17:00:05 -08:00
Heilig Benedek
a2b0e30714 Merge pull request #5 from atom/master
update as upstream
2016-02-12 01:57:08 +01:00
Habib Rehman
3adcaa7681 Fix electron binary relative path
The relative path for Electron's binary is Contents/MacOS/Electron
2016-02-12 00:11:02 +00:00
Robo
c09ff40916 browser: handle desktop capture devices in media permission request 2016-02-12 05:07:06 +05:30
Kevin Sawicki
9d6344704e Merge pull request #4382 from atom/throw-explicit-error-when-webview-api-is-unavailable
Throw explicit error when WebView API isn't ready
2016-02-11 13:34:01 -08:00
Kevin Sawicki
042825e8fb emmitted -> emitted 2016-02-11 13:32:34 -08:00
Kevin Sawicki
9609b36b3c Add missing semicolon 2016-02-11 13:28:33 -08:00
Kevin Sawicki
da6ebac742 Use assert.throws 2016-02-11 13:28:33 -08:00
Kevin Sawicki
bad4816976 Expand error message 2016-02-11 13:28:33 -08:00
Kevin Sawicki
674af4211c Use interpolated string 2016-02-11 13:28:33 -08:00
Kevin Sawicki
42a8674cea Add missing semicolon 2016-02-11 13:28:33 -08:00